summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/kitmanager.cpp
Commit message (Collapse)AuthorAgeFilesLines
* FileUtils: Add static method to construct FileNames from Latin1Tobias Hunger2014-02-111-1/+1
| | | | | Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983 Reviewed-by: Daniel Teske <daniel.teske@digia.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>
* Kit: Add constructor to restore Kit from QVariantMapTobias Hunger2013-10-171-2/+5
| | | | | | | | | | | | | | Do not trust kits with an invalid id, as there is no way those could have ended up being saved out by creator. Safe all other kits that were constructed using Kit(const QVariantMap &). This new constructor uses the code that used to be in fromMap(...), with some simplifications. Remove fromMap(...) method from kit as it is no longer used. Change-Id: Iac28ea9b85670e03088a4b7c5283af6b4b70c0fc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kits: Simplify handling of sticky kit informationTobias Hunger2013-09-121-12/+7
| | | | | Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42 Reviewed-by: hjk <hjk121@nokiamail.com>
* ProjectExplorer: Clean up KitsManager APIhjk2013-09-111-41/+47
| | | | | Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: makeSticky() -> setSticky(), allows for unsetting sticky bitDaniel Teske2013-09-031-1/+1
| | | | | Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: Use FileName for icon pathTobias Hunger2013-08-231-1/+1
| | | | | Change-Id: Ica6cf20c4ae1c7d58386d4970e468a105a3263b3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* KitManager: Use static API as other singletons doTobias Hunger2013-08-211-38/+37
| | | | | Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155 Reviewed-by: hjk <hjk121@nokiamail.com>
* Kit: Only make SDK-set KitInformation read-onlyTobias Hunger2013-05-071-1/+10
| | | | | | | | Leave the rest user-editable. Task-number: QTCREATORBUG-9030 Change-Id: I77c9ff980dd9a497bff53ee04dae7e771e4e7e82 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Clean up where the QSettings is retrieved from.Eike Ziller2013-04-101-1/+1
| | | | | | | | | | The settings in the plugin manager (local/global) are where the plugin manager is supposed to look for its settings, which has per se nothing to do where Qt Creator wants other settings to be written to. All Qt Creator code should use ICore::settings() for that instead. Change-Id: I28bd855ae6cbcdf8d19017eb44f178e4624a1a61 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in ProjectExplorer.Friedemann Kleint2013-03-261-9/+2
| | | | | | Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kits: Fix making names unique in optionspage for kitsTobias Hunger2013-03-201-6/+52
| | | | | | | Task-number: QTCREATORBUG-8861 Change-Id: Iea9948f1f62a79df36b239ad3981cb137b44e5bd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kits: Avoid some of the deprecated QString uses with Core::Idhjk2013-03-191-3/+2
| | | | | | Change-Id: I40f4a0ff63fd99ecb1a9d8a35f034b1a48d6de84 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-181-3/+4
|\ | | | | | | | | | | | | Conflicts: doc/src/debugger/qtquick-debugger-example.qdoc Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
| * KitManager: Check for user settings fileAurindam Jana2013-03-141-1/+4
| | | | | | | | | | | | | | | | Check if the user settings file exists before trying to restore kits. Change-Id: Ie4502eef48234a8b4b99c58362643576d8338aaa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Kits: Fix saving of kit data.Tobias Hunger2013-03-121-2/+0
| | | | | | | | | | | | | | | | | | | | Make sure to not save in the KitManager destructor: Depending on how creator is shut down (e.g. auto-shutdown after running plugin tests) the other Managers may already be gone and then the Kit data will be damaged. Change-Id: Ieca06b8ac979024a90cb3b7d5e41f4506b4480bd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Kits: Sort kits by displaynameTobias Hunger2013-03-081-3/+37
|/ | | | | | | | Task-number: QTCREATORBUG-8879 Task-number: QTCREATORBUG-7561 Change-Id: Ie61c6571d5398c48196876ea2eb6460f5f43caec Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Remove some dead codeTobias Hunger2013-02-281-8/+0
| | | | | Change-Id: I06d6cbd8f49db400076d45c644643181c986cc3a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* KitManager: Load settings in extensionsInitialized()Tobias Hunger2013-02-281-9/+8
| | | | | | | Add isLoaded() method to make assert that we have our data loaded. Change-Id: I50a1847464ec3641a288226c69df93e0d789affd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kits: Warn when initializing something too early/lateTobias Hunger2013-02-261-1/+7
| | | | | | | | | | | | Warn when somebody tries to register KitInformation after kits are already loaded. Also warn when trying to access kits before all plugins are initialized. This helps with making sure that initialization of plugins is done as expected. Change-Id: Ie2e9c79eee2a2c0de3397db9a95b5e41b614bfe8 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Add sdkProvided flag to KitsDaniel Teske2013-02-211-1/+3
| | | | | Change-Id: Ic413ed46abd4455b5bc3d282326e95b9dd372b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kits: Make sure registered kits can not get deletedTobias Hunger2013-02-081-3/+13
| | | | | Change-Id: I3b293ed9371b201e692fae7a7569239ebc8483e9 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>
* | KitManager: Enable KitInformations to be invisible for KitsDaniel Teske2013-01-311-0/+2
| | | | | | | | | | | | | | This was only possible in theory but not in pratice. Change-Id: Ia5100569c371134e3cabacfcd76084c8763f5ecc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * Kits: Reduce magic while improving setupTobias Hunger2013-01-221-2/+6
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-8576 Task-number: QTCREATORBUG-8081 Change-Id: I9a6675a8ae97517f78bca026c4aa0edca82d606d Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-161-21/+30
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/android/androidrunner.cpp src/plugins/projectexplorer/kitmanager.cpp Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
| * KitManager: Scope KitGuardAurindam Jana2013-01-161-6/+8
| | | | | | | | | | | | | | | | Scope KitGuard correctly to avoid emitting kitUpdated signal when adding a kit. Change-Id: Id9b0f92c7c2be8adaf7490cfbecfaceb8717b80f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Kit: Only emit signals from KitManager after all kits are restoredTobias Hunger2012-12-191-15/+22
| | | | | | | | | | Change-Id: Iab5a951a3cec37328b5bcd9d8c3f9c1a31c3d85b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-141-0/+7
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
| * Kits: Always use settings found in the SDKTobias Hunger2012-12-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Keep settings not found in the SDK-installed kit as seen in the user-specific settings, but use the SDK settings for everything else. Downside: The compilers might change if you have several compilers supporting the same ABI. Change-Id: I71a0935cc180149b333ec38a03bd2556892c49cc Tasknumber: QTCREATORBUG-8390 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-261-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/projectexplorer/kitmanagerconfigwidget.cpp src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qtsupport/baseqtversion.cpp tests/auto/cplusplus/findusages/tst_findusages.cpp Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
| * Remove Q_ASSERTsTobias Hunger2012-11-171-2/+2
| | | | | | | | | | Change-Id: I7344935fd488b4bd65517378ca198185023c2532 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Kit: Add createOutputParser methodDaniel Teske2012-11-021-0/+6
| | | | | | | | | | | | | | | | | | Which asks each KitInformation for their parser, thus currently creating a toolchain + qt chain if that is applicable. Remove all code that does that by hand from various buildsteps/buildconfigurations. Change-Id: I79a07ffd1dbe9a43bdbc838bc0098071aa412009 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-221-0/+5
|\ \ | |/
| * Kit: emit kitUpdated signals on changes to devices/toolchains/qtDaniel Teske2012-10-191-0/+5
| | | | | | | | | | | | | | | | That is even if the id did not change, but the actual objects for those ids changed. Change-Id: Ib176f18cf66b11436d046bf08a81db27fce458f9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-161-39/+18
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
| * Kit: Improve the options pageTobias Hunger2012-10-161-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update warning icon as changes happen * Make clone clone the current settings, not what used to be there before changes were made * Make sure the edited entry is visible in list view * I find the KitModel much easier to understand now Task-number: QTCREATORBUG-7862 Task-number: QTCREATORBUG-7803 Change-Id: I124c2e5a96cea7386896084e1027ba79a8be20b7 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Fix possible crashTobias Hunger2012-10-131-0/+2
| | | | | | | | | | | | | | | | I introduced this when splitting up my patchset for review. Bad patch is 4a9130a0 Change-Id: I08729c75e0e9c5d8d345e4e0bb4dfa865fdedcaa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * KitManager: Reduce number of validations happeningTobias Hunger2012-10-121-6/+1
| | | | | | | | | | | | | | Do not trigger needless validations Change-Id: Ia51ce07c51c1d98f508584fc762ad4f29f0cf4f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * KitInformation: Make validate work on const Kits and add fix methodTobias Hunger2012-10-121-3/+10
| | | | | | | | | | | | | | | | Make sure validate will not modify kits, add a fix method to do that when kits are loaded/added. Change-Id: Ib378af0f3470b2caf64177b35fca061089ac4523 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * KitManager: Add signal to notify about kit updates of unmanaged kitsTobias Hunger2012-10-121-2/+5
| | | | | | | | | | | | | | | | This is necessary to work with temporary kits (like copies of kits done for the options page). Change-Id: I0a795dd7431d47a18a65880ef31563b26029a949 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * Kit: Simplify validation of kitsTobias Hunger2012-10-121-27/+1
| | | | | | | | | | Change-Id: I562e6f8d5fef36eea543c208cdd855db048b7f33 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Emit signal after loading kitsTobias Hunger2012-10-151-0/+1
|/ | | | | Change-Id: I60b80fba07ba35c67d60576cdaa5af9af57e6f23 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kit: Fix restoration of kits with SDK aroundTobias Hunger2012-10-111-12/+10
| | | | | | Change-Id: Ic2fc9394ff9b21a6e87565ee589e72e844096cb4 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix check for global Kit fileAndreas Holzammer2012-10-091-1/+1
| | | | | | | | | KIT_FILENAME is not a file, but a path to a file. This fails if passed as dir + <path to file>, so just concat strings here. Change-Id: Id38b29b546c107b79550e1d190b8e6cecef97fb4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Restore system kits only if the kit file existYuchen Deng2012-10-081-12/+11
| | | | | Change-Id: I2e5e31d2d744203d2a0834a3169a73c43e61447d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fixed "can not"Robert Loehning2012-10-081-2/+2
| | | | | Change-Id: I1ebfee92df0f4bd2e9520a4e831352b780d6b556 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
View Lorry Controller Status