summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectexplorersettingspage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move declaration of ProjectExplorerSettingsWidget into .cpp file.Friedemann Kleint2016-02-031-0/+32
| | | | | | | Alternative fix to ff8dd50f7b100d3bfeb7d70ae2867e886b16b5d5 . Change-Id: I151b45f73b19309979f1a3a1d6617e45f3205442 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: ModernizeTobias Hunger2016-02-031-4/+0
| | | | | | | | | * Use override where appropriate * Use pragma once * Make more constructors explicit Change-Id: I2865fe10f288e3de570826058e43b70a0cb4ee37 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Use Qt5-style connectsOrgad Shaneh2016-02-011-4/+6
| | | | | | | The heavy lifting was done by clazy. Change-Id: I619db09a79760186b72e7662490ed1205155c1a7 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>
* Add an option "Stop before build" for windows usersDaniel Teske2015-09-241-0/+2
| | | | | | | | | | | | | | | | | | | | | On windows, users frequently get compile errors because the application binaries/libraries are locked while the application is still running. A good solution would require actually knowing which builds output files that are used by the currently running applications, and would distinguish between locally running applications and remote applications. This solution in this patch is far simpler, it offers a option to stop all runcontrols or stop all runcontrols from the project, that the user wants to build. Those options don't take into account whether stopping those applications is actually needed and is global. Change-Id: I75b0b6c450898bb29c1e4f9c18c3199aeed696fe Task-number: QTCREATORBUG-13188 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* VariableChooser: Reworkhjk2014-10-151-2/+3
| | | | | | | | | | Allow multiple expanders to be registered for lineedits, e.g. a local and the global ones, and actually show them. Use a tree view in the chooser for somewhat more structured display. Change-Id: I769f92144e5249f45e54381de52aa6973eb20118 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * 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>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-101-37/+9
|/ | | | | | | | | | | | | The default "matches" method now takes the widget and looks for all child labels, checkboxes, push buttons and group boxes. Because of that, the former "createWidget" method can be called multiple times without creating a new widget (-->widget()), and the "finished" method must ensure that the created widget gets deleted, since not all widgets that were created are added to the UI anymore. Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ProjectExplorerPlugin: Make settings accessor statichjk2013-09-061-2/+2
| | | | | Change-Id: Ic4c78e4d2eefeefe55e2868a7f9db1eca52c3863 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-06-051-1/+3
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmljstools/qmlconsoleitemdelegate.cpp src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
| * ProjectExplorerSettings: Keep environmentId.Tobias Hunger2013-06-031-0/+2
| | | | | | | | | | | | | | | | | | | | Make sure to not change the environmentId when editing something in the settings page. Task-number: QTCREATORBUG-9359 Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * ProjectExplorerSettingsPage: Do not have a const setter.Tobias Hunger2013-06-031-1/+1
| | | | | | | | | | | | Change-Id: Ic0a71ce49b9f65894860562b8414772cd839152c Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Make adding variable support to textcontrol easier.Eike Ziller2013-03-281-2/+1
| | | | | | | | | | | | | | | | Add convenience method in variable chooser and move magic constant to the place where it's used. Change-Id: Ie93acb98e13efcacb77d1a478df927a11b16926b 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>
* | Add variable chooser to default build directory.Eike Ziller2013-03-141-0/+3
|/ | | | | Change-Id: I7f55f7826c040ba48c48a805ec6c9eada456d78a 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>
* | Use Core::Id for IOptionsPage::m_idhjk2013-01-171-1/+1
| | | | | | | | | | Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Use Core::Id for IOptionPage::categoryhjk2012-12-291-1/+1
| | | | | | | | | | Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512 Reviewed-by: hjk <qthjk@ovi.com>
* | Add configuration option for default build directoryTobias Hunger2012-11-211-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Change the UI to always show the editor for the build directory. Default to what we do for qmake projects right now (with shadow- building enabled). Use this setting in qmake based projects. Set this to '.' for in-source builds by default. Change-Id: I3fb26ab817b0f545e9b318b68e592df8040d5562 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Add option to place shadow build directory parallel to source tree.Aaron McCarthy2012-10-271-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option requires that the projects directory setting is enabled. For example with the following settings: Projects directory: $HOME/depot Build directory: $HOME/build This will by default place the default shadow build directory in the $HOME/build tree instead of adjacent to the source in $HOME/depot. Change-Id: I74bfc00883d0479d5965350c760d14ef7602cc34 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Utils: Introduce HostOsInfo class.Christian Kandeler2012-08-271-3/+2
|/ | | | | | | | | | | | | The class' member functions are intended to be used instead of the Q_OS_* macros in all contexts where the latter are not syntactically required. This lowers the likelihood of changes made on one platform breaking the build on another, e.g. due to the code model missing symbols in #ifdef'ed out code when refactoring. Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* IOptionsPage: replace virtual fuctions by data membershjk2012-05-231-23/+7
| | | | | Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-5/+5
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | 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>
* Core::Filemanager: make some methods statichjk2012-01-251-6/+4
| | | | | | | This follows suit to the ICore changes. Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-2/+2
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* ProjectExplorer: Add an option to pop up app outpuit pane when debugginghjk2012-01-111-0/+2
| | | | | | Task-number: QTCREATORBUG-6764 Change-Id: I24620c00220adccc39271a4d8c02cd0b6aec4b78 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-091-1/+1
| | | | | | | | - Add missing translations - Remove some unneeded conversions. Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075 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>
* Option to merge stderr in application outputFawzi Mohamed2011-05-171-0/+4
| | | | | | | | When activated shows correct interleaving of stdout and stderr messages, but looses stderr highlighting. Task-number: QTCREATORBUG-4821 Reviewed-by: ossi
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Make the buffer size for the Application Output window configurablecon2011-04-291-0/+2
| | | | Task-number: QTCREATORBUG-4531
* Update license.hjk2011-04-131-14/+13
|
* Add "never ask again" option to dialog asking about killing applicationscon2011-01-171-0/+2
| | | | | | | | | | | | The option is used for the stop button in the application output. Closing tabs will still ask unconditionally, also if applications would be killed as a side-effect, e.g. of closing Qt Creator. The Symbian controls also always ask, with a more descriptive text, because killing applications might have negative effect on the device in some cases. Reviewed-by: Friedemann Kleint Task-number: QTCREATORBUG-3119
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* ProjectExplorer: Add option to not show output on rundt2011-01-111-0/+2
| | | | Task-Nr: QTCREATORBUG-3433
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | Update the filter matches for the settings dialog.con2010-12-011-1/+17
|/ | | | Task-number: QTCREATORBUG-2936
* Add option for the word-wrap mode of the application output.Leandro Melo2010-09-081-0/+2
| | | | | Task-number: QTCREATORBUG-2190 Reviewed-by: dt
* Wire in Deployment logicTobias Hunger2010-07-121-2/+4
|
* Fixed translation of "Projects"Robert Loehning2010-06-161-1/+3
| | | | Reviewed-by: dt
View Lorry Controller Status