aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/configmodel.h
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Remove magic configuration from CMakeTobias Hunger2020-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Get rid of magic configuration handling in the CMakeProjectManager. * Use CMakeCache.txt as the sole source of truth, do not keep a shadow copy of configuration in the .user file * Have initial CMake arguments that are easy to edit in batch (Fixes: QTCREATORBUG-18179) used whenever no CMakeCache.txt file is in the build directory. These allow for any thing that can be passed to CMake on the command line. (Fixes: QTCREATORBUG-16296) * Ask when changes to CMake configuration were not applied (Fixes: QTCREATORBUG-18504) * Run cmake with arguments effecting its configuration only when the CMake settings are changed in the UI, run CMake without any special arguments in all other cases. * Get rid of the confusing dialog used to keep settings in sync between what is in CMakeCache.txt and Creator (Fixes: QTCREATORBUG-23218) Change-Id: I26d55be7df733f084f5691ecf7d7b4352f58b8e7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Fix includes all over the CMake pluginTobias Hunger2020-04-201-1/+2
| | | | | | | | | | | | | | Keep internals internal, remove some unnecessary includes, add some that should have been there. This reduces the number of files that get rebuild when working on CMake internals from over 1000 to about 200. This patch also moves some code around that ended up being in the wrong file. Change-Id: Icd7366ac760dc85031040720418fbb16336dce9b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakeProjectManager: ModernizeAlessandro Portale2018-11-251-1/+1
| | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using Change-Id: I6a272bc3b75835840b3d6cbe83be6f50f94bbedb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CMake: Fix "CMake settings have changed on disk"Tobias Hunger2017-10-241-2/+3
| | | | | | | | | * Improve the UI by showing settings in CMake and the project * Fix setting CMake configuration to project Change-Id: I6e127344551fa00f3f7e6170465cb3dda2e4a634 Task-number: QTCREATORBUG-17555 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Allow to unset configuration valuesTobias Hunger2017-10-171-0/+3
| | | | | Change-Id: I649323e3c2cc51ea69dd7e216f30eeb653f3873b Reviewed-by: hjk <hjk@qt.io>
* CMake: Fix project parsing notificationTobias Hunger2017-10-061-1/+5
| | | | | | | | | This builds on top of 08677c0b014cc44d944e32d462f502a67c948404 and fixes one more code path to go through a common entry/exit point. Change-Id: I1d00fa9242f247028e5d3b0ef3b5fe1d3f4cb03d Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Enable type forcing for CMake configuation valuesTobias Hunger2017-09-191-2/+2
| | | | | | | | Allow to force the type for CMake configuration values, now that this type changes how you can edit the values. Change-Id: Id89e0ec8547b778fc0aff9a2e00c0d7406cbcac1 Reviewed-by: hjk <hjk@qt.io>
* CMake: Improve delegates for CMake configurationTobias Hunger2017-09-191-3/+3
| | | | | Change-Id: Ib1d2bfca1b2faafd36c53f24c6649e73ee0af190 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Allow CMake configuration to be forced to string typeTobias Hunger2017-09-181-0/+3
| | | | | | | This allows editing values with misidentified types in Project Mode. Change-Id: Ic74da2ca71cc9046cbbeb1202075976c9edd28b7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Group entries in project configurationTobias Hunger2017-09-121-12/+34
| | | | | Change-Id: I6aa797f5ff49a5cc33dfbdf0b25dcd78abbff66e Reviewed-by: hjk <hjk@qt.io>
* CMake: Hide INTERNAL and STATIC configuration entries in Project UITobias Hunger2017-06-201-0/+1
| | | | | | | Task-number: QTCREATORBUG-18403 Change-Id: I6b69305ff0dc337da1d8b20e0321be5ce1b1f595 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Mark changes to CMake configuration that contradicts a kitTobias Hunger2017-01-201-0/+3
| | | | | | | | Mark changes in the project that override configuration settings from the kit. Task-number: QTCREATORBUG-17244 Change-Id: I3452116ad5f4626ffcd85dfcc86715b6946d6572 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Mark configuration items that were taken from the CMakeCache.txt fileTobias Hunger2017-01-191-0/+1
| | | | | Change-Id: Id9e707d7b07d35ade44959955db61810e34f7b30 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Fix the config model merging dataTobias Hunger2016-12-021-3/+5
| | | | | | | Old user-settings used to get lost. Change-Id: I5197c3b57b12d94e7464a86261a1364dd9aca266 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMakeProjectManager: Support drop down selector for optionsAlexander Drozdov2016-10-101-1/+8
| | | | | | | | | | | | | | | | | | | CMake provides "hack" for cmake-gui, that allows set options variants and select then from drop down list. Allows Qt Creator re-use this solution. See: - https://blog.kitware.com/constraining-values-with-comboboxes-in-cmake-cmake-gui/ - http://blog.bethcodes.com/cmake-tips-tricks-drop-down-list Drop down values can be added to option via: SET_PROPERTY(CACHE OptionName PROPERTY STRINGS Option1 Option2 Option3) This solution should not restrict to provide any other value, it provides only suggestion for user to select one of prdefined values. Change-Id: I8fc52155775f1e04979db8206bb42363df9359e8 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-05-271-0/+4
|\ | | | | | | Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
| * CMake: make it possible to insert new vars in project settingsStanislav Ionascu2016-05-241-0/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-16238 Change-Id: If98acc4f27cabbb606b2fc1017096da626ba1144 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Wholesale conversion to #pragma oncehjk2016-03-301-1/+0
|/ | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CMake: Add UI to display and edit cmake configurationTobias Hunger2016-02-151-0/+86
Change-Id: I95944dcd58dc86023c2757068979f92b8989011b Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>