summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove environmentinformation from the runconfigurationsTobias Hunger2013-04-111-39/+0
| | | | | | | | It is no longer used. Change-Id: Ie99af7b432bba07f8e334c99817bd535828ade8b Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in QmlProjectManager.Friedemann Kleint2013-04-091-3/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I2d1d2ec5a3071de9d2a0a03bc69ec653becc7f85 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix margins of QmlProjectRunConfiguration in Project modeTobias Hunger2013-04-081-0/+1
| | | | | Change-Id: Ice9e1256ca10b66de065495080cdf121e4e19279 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-201-1/+1
|/ | | | | | Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Profile introductionTobias Hunger2012-06-211-71/+4
| | | | | | | | | | | | | Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* qtcassert: move actual printing to separate function and enforce stylehjk2012-04-171-1/+1
| | | | | | | This also allows simple setting of breakpoints on failed asserts. Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QtVersionManager::qtVersionsChanged() split list into add/remove/changeDaniel Teske2012-03-061-1/+1
| | | | | | | Makes it easier to do the right thing. Change-Id: Id6c6754033b3310c6b8c68a4aacc22cbaef268ee Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"hjk2012-02-211-36/+0
| | | | | | | | | | | | This is the first step of a larger refactoring. The plan is to make debuggersettings more orthogonal to individual runconfiguration implementation. This patch alone already pushes the settings handling to the debugger plugin and removes code duplication in the runconfiguration implementation. Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-6/+6
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-2/+1
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlProject: Make sure 'mainFile: "xxx"' is always respectedKai Koehne2012-01-101-21/+11
| | | | | | | | | | | Prevent user from overriding the file to launch through the run configuration dialog. The old logic was broken (main file was always the editor), and arbitrary files can now be previewed conveniently with Tools->External->Qt Quick->Preview. Task-number: QTCREATORBUG-6683 Change-Id: Icee1d11e5063ca634e835bb57ffc77bf973ee93f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge branch '2.3' into 2.4Oswald Buddenhagen2011-10-181-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/commonoptionspage.ui src/plugins/madde/maemoqtversion.cpp src/plugins/projectexplorer/runsettingspropertiespage.ui Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
| * Fixed some typos and added some missing ellipisesJure Repinc2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | During translation into Slovenian I noticed some typos in original string. For example some missing ellipsis characters and some incorrectly spelled MeeGo names (as Meego) Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41 Merge-request: 2200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Reduce number of categories and minimum size of preferencesEike Ziller2011-09-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | Merges the Project, Qt4 and Tool Chain categories into one Build & Run category, which makes it finally possible to reduce the minimum height of the preferences dialog. Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138 Reviewed-on: http://codereview.qt-project.org/5023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-291-3/+6
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/qml/qmlengine.cpp Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
| * Show baseEnvironment changes in QmlProjectRunConfigurations's widgetDaniel Teske2011-07-291-3/+6
| | | | | | | | | | | | | | | | | | | | | | That react to editing qt versions and selecting a different qt version. The environment also depends on the available toolchains, that is not taken into account. Change-Id: I70fc1d444a0cbceb4fcb35fb7961bac8a0db9c14 Reviewed-on: http://codereview.qt.nokia.com/2353 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | ProjectExplorer: React to debuggersChanged() signal by RunConfigurationsDaniel Teske2011-07-291-2/+0
|/ | | | | | | | | | And update the run actions in response to that. Change-Id: I45e6ada3ff5e2b529636a3d8826114db3d1650be Reviewed-on: http://codereview.qt.nokia.com/2339 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Move a lot of qmake independent classes to a new plugin qtsupportdt2011-05-241-6/+6
| | | | | | | | | | Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by passing in the qtversion instead of figuring it out in qmldumptool. Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c Reviewed-on: http://codereview.qt.nokia.com/70 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* fix "Debugger:" label alignmentOswald Buddenhagen2011-05-171-8/+2
| | | | | on the way also greatly simplify the code in most copies. it was probably trying to do what i did, but failed miserably.
* Qt Version refactoringdt2011-05-121-1/+1
| | | | | | | | | | | | | | | | Split up target specific code into subclasses. Also change Qt4BuildConfiguration to allow a null qtversion. Remove code that relied on always having a qt version. Also make it possible to remove all qt versions. Completly change the qt in path autodetection to be only a fall back if no configuration was found. Note: For now the old settings are not removed, as such 2.2 and master can coexist. Reviewed-By: hunger
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* QmlDebug: Enable 'What are the prerequisites?' link in run configurationKai Koehne2011-02-251-0/+3
| | | | | DebuggerLanguageChooser is in utils, which is why we cannot directly open the URL in the help plugin.
* ToolChain: Refactor toolchain supportTobias Hunger2011-02-211-0/+1
| | | | | | | | | | | | | | | | | | Refactor ToolChains in Qt Creator: * Allow for several toolchains of the same type * Be smarter wrt. guessing what kind of output a toolchain produces. This allows us to eventually handle e.g. embedded linux setups way better than before. * Be smarter wrt. guessing what kind of environment a Qt version needs. * Improve auto-detection of toolchains a bit * Decide on which debugger to use based on the kind of output produced by the compiler. * Add options page to configure toolchains * Remove toolchain related options from the Qt version dialog Reviewed-by: dt
* Exported header cleanup.Friedemann Kleint2011-01-201-4/+6
|
* Clean up environmentmodel/widgetTobias Hunger2011-01-131-1/+1
| | | | | | | | * Move the environment model code to utils and export it * rename the environmenteditmodel files to environmentwidget (which is the class they actually contain) Reviewed-by: dt
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers, part 2con2010-12-171-7/+11
|
* QmlProject: Add mainFile propertyKai Koehne2010-12-081-16/+54
| | | | | | | | | | | The mainFile property of QmlProject is the default file to run. People have still the opportunity to override this in their run settings, though. The wizard generated code was updated accordingly. Note that this makes projects generated by the wizard incompatible with QtCreator 2.1! Task-number: QTCREATORBUG-3249
* QmlProject: Restrict UI to using the System EnvironmentKai Koehne2010-11-291-49/+1
| | | | | | | There are probably very little use cases where you want to start from a clean environment, and there is no such thing as a Build Environment (although we magically add some toolchain settings to the environment).
* QmlProject: Allow user to change process environmentKai Koehne2010-11-291-7/+101
| | | | Task-number: QTCREATORBUG-2600
* QmlProject: Split RunConfiguration, ..Widget into two classesKai Koehne2010-11-291-0/+233
View Lorry Controller Status