aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/localapplicationruncontrol.cpp
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplorer: Dissolve SimpleRunControlhjk2017-04-211-1/+3
| | | | | | | | As planned. Change-Id: I9d9349cdd174c47b2331095fbe545b811e6ca770 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Add a SimpleRunControl implementationhjk2017-03-141-84/+1
| | | | | | | | | | Essentially a RunControl with and ApplicationLauncher member like it is used directly or in disguise in the LocalApplicationRunControl, Nim and Python. Extenting that to RemoteLinux/Qnx is possible, but left to the next patch. Change-Id: I91b3199d3d6a418fe4e5be7a5d61689c581a5121 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Return a ProcessHandle for AppLauncher::applicationPIDhjk2017-03-101-2/+2
| | | | | Change-Id: I00fc4dbd3a3c022006de95087b61a86bbb83faeb Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Switch responsibilities for raising applicationshjk2017-03-081-2/+1
| | | | | | | | | | Instead of letting the launcher decide to raise something when started (and only then) leave it to the RunControl to trigger (and for now also to implement) as response to the application launcher start (or possibly now, in other circumstances). Change-Id: I0ac8f1e633981f7bf316c88e83c208765886d9a1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Unify RunControl setup/teardownTobias Hunger2017-03-011-14/+4
| | | | | | | | | | | | | | Provide protected methods in RunControl to handle the notification of when the RunControl starts and stops. Use these helpers to move the isRunning() method into the RunConfiguration itself instead of reimplementing it everywhere. Change-Id: Ia8de42f7a6a14a049870d4e7fcb9af6756c2caa4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Move ProcessHandle to Utils for further re-usehjk2017-01-171-0/+2
| | | | | | | | | | | | | | Also, use qint64 instead of quint64, as this is what Qt uses. Keep 0 for invalid PIDs, even if arguably -1 would be better, but Qt uses 0, too. Don't move 'toString', instead inline it into the only caller, keeping translations intact. Task-number: QTCREATORBUG-17596 Change-Id: Ie9411ea1d2031a5ab0a99bcb3ff48ee430afe254 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Move icons to UtilsUlf Hermann2016-08-051-3/+2
| | | | | | | This way we can use them from libraries, not only from plugins. Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-05-091-3/+9
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotest/testcodeparser.cpp src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri tests/unit/unittest/unittest.pro Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
| * Make local custom executables run independent of device selectionhjk2016-05-041-3/+9
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-16199 Change-Id: I1e9e2103e626c6480fa1c5ac9b2b3f8ac93e3038 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-221-1/+1
|\| | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
| * Theme: Separate run/stop/interrupt icons in menusAlessandro Portale2016-04-211-1/+1
| | | | | | | | | | | | | | And for that, we also need separate theme color roles. Change-Id: I27bf4499acb516f7f824f5e57632797653b150ec Reviewed-by: hjk <hjk@theqtcompany.com>
* | Projectexplorer: Modernize codebaseTobias Hunger2016-04-151-2/+2
|/ | | | | | Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
* Icons: Move Run/Stop/Interrupt from projectexplorer to coreAlessandro Portale2016-04-101-2/+3
| | | | | Change-Id: Iba65c2ede538049c9b203fd4c2f99ef552019862 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Project Explorer: Fix message punctuationLeena Miettinen2016-04-051-1/+1
| | | | | Change-Id: I49d569d1051a4bd15bfa74349969174532661714 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* ProjectExplorer: Remove a shadow runnable in LocalApplicationRChjk2016-02-011-20/+17
| | | | | | | The one in the base class is completely sufficient. Change-Id: I6e39ef856fb73377318df28e373f27d0a1c2c977 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Use StandardRunnable in ApplicationLauncherhjk2016-01-281-2/+1
| | | | | Change-Id: I7092d748207762d3dbd6c69c01cc06c88cbf63d8 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* ProjectExplorer: Use environment from Runnablehjk2016-01-261-7/+1
| | | | | | | | ... instead of re-fetching it from the EnvironmentAspect. Change-Id: Iab25d7d828ac3811eebc8bb149f53e61299e500e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Use StandardRunnable in LocalApplicationRunControlhjk2016-01-261-64/+58
| | | | | | | Also un-export LocalApplicationRunControl. Change-Id: Ide5dbb61035d9f648f517a9d89763803ac0c4d26 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Drop LocalApplicationRunConfigurationhjk2016-01-261-15/+15
| | | | | | | | The functionality can be provided by producing a suitable Runnable in the derived classes directly. Change-Id: I7b8e8fe33fffd2b00176b6cf6633eca4e152e466 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-1/+2
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Icon refresh: First step towards the new Qt Creator themesAlessandro Portale2015-10-231-2/+3
| | | | | | | | | | http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* ProjectExplorer: Use Core::Id as RunMode "enum values"BogDan Vatra2015-06-301-4/+4
| | | | | | | | | | | | | This provides a way for third-party plugins to implement run modes without the need to add a value to the central enum or using manual workarounds like RunMode(*(int*)&someUniqueObject). Instead of centrally defined enum values this uses Core::Id that could be defined anywhere. Change-Id: Ic350e3d8dbb8042c61b2d4ffec993ca151f53099 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Make the LocalApplicationRunControl more flexibleBenjamin Zeller2015-06-111-10/+28
| | | | | | | | | | | In order to make it possible to use the LocalApplicationRunControl without a LocalApplicationRunConfiguration it is required to add some setter functions to get all the required data which is not offered by the base RunConfiguration type into the RunControl object. LocalApplicationRunControl also needs to be exported. Change-Id: I1c03d924cd69609ee5f23fa69842da98ae86fab8 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-1/+1
| | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Merge "Merge remote-tracking branch 'origin/3.2'"Eike Ziller2014-10-141-7/+8
|\
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | ProjectExplorer: Remove redundant namespace qualificationsOrgad Shaneh2014-10-141-1/+1
|/ | | | | Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc Reviewed-by: hjk <hjk121@nokiamail.com>
* RunControlFactories: No need to check for isConfiguredDaniel Teske2014-07-311-3/+1
| | | | | | | | | Checking if a runconfiguration is configured happens before searching for the right factory, thus the factory can assume that it always gets a configured runconfiguration. Change-Id: I171318dda22c4e89f3619418336865cb28a3dc5f Reviewed-by: hjk <hjk121@nokiamail.com>
* RunControl: Make icon(path) a value memberhjk2014-05-301-6/+1
| | | | | Change-Id: I7f7099d03a25a14d8df02273cca928e9f1fbfe1d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add a few missing QDir::toNativeSeparators().Friedemann Kleint2014-01-091-1/+1
| | | | | | | | Fix messages shown when trying to launch/debug a non-existing binary. Change-Id: I2b69904595effd97e143b57ee64df085c20bff28 Reviewed-by: hjk <hjk121@nokiamail.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-221-6/+6
| | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ApplicationLauncher: Also emit the exit statusDaniel Teske2013-08-021-5/+11
| | | | | | | | | And adjust the message in the appliation output to take the exit status into account. Change-Id: I1b7507fdc8ff6fa7ec3db48dba72ad723f124fc3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* LocalRunControl: Fix wrong "exited with error code -1" outputDaniel Teske2013-06-111-1/+5
| | | | | | Task-number: QTCREATORBUG-8337 Change-Id: I585b6330e6aa18891ebf0171bf6c8813761943f1 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* IRunControlFactory::displayName: Remove unused functionDaniel Teske2013-04-251-5/+0
| | | | | | | It's never used. Change-Id: I11cc85b1d9a5944017b8a03738877f91cfe5d11f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Use EnvironmentAspect to retrieve the environmentTobias Hunger2013-04-111-1/+5
| | | | | Change-Id: If878e22cc2715d05bb3e65ad908cd4fb5e21b03b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Clean headers in ProjectExplorer.Friedemann Kleint2013-03-261-3/+0
| | | | | | Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@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>
* | LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp)Tobias Hunger2013-01-281-1/+1
| | | | | | | | | | | | | | I ran once too often into them being called applicationrunconfiguration.(h|cpp)! Change-Id: I280a3280173b80d4d955faddedf11688786eee14 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | LocalApplicationRunControl: Make sure Starting message is firstDaniel Teske2012-11-271-2/+2
|/ | | | | | | Task-number: QTCREATORBUG-8188 Change-Id: Idacdccc00f8c0fb4c7646fdc2fde2765f79297f1 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix error handling for custom executables.Friedemann Kleint2012-09-181-4/+1
| | | | | | | | | | | | | Prevent dialog showing "No executable" when canceling the prompt for the executable when pressing 'Run' / 'Debug' on a library project. Introduce new LocalApplicationRunControl::ensureConfigured() to ensure the configuration is complete and detect cancel via empty/non-null strings. Change-Id: I9bd4a296e7c995d26d6ad265519e7ebd3f98d6fe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Add error string to IRunControlFactory::createRunControlDaniel Teske2012-09-051-2/+5
| | | | | | | | | And add a few helpful error messages Task-number: QTCREATORBUG-7826 Change-Id: Ia9f9fa476cecf2cff198bc460408bc062e119338 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* runconfig: consolidate createConfigurationWidget implementationshjk2012-06-191-6/+0
| | | | | | | | Most derived classes used essentially identical 'return 0;' implementations. Use a base class implementation doing that instead. Change-Id: I99727ac2230a5d9f168b4b0eb5927f8efff44e64 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* LocalApplicationRunControl: Track state of stub for isRunningDaniel Teske2012-03-061-2/+4
| | | | | | | | | Task-number: QTCREATORBUG-6885 Task-number: QTCREATORBUG-6926 Change-Id: I1cf29656a1de96817681bc2002d6cbc27ae07d20 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-3/+3
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>