diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-29 23:34:52 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-10-24 11:10:30 +0000 |
| commit | 3f73f3a4f408c855666f55889584df26948e0749 (patch) | |
| tree | 473c87e146e191dfd6a14633ff50210dcd2f042b /src/plugins/cmakeprojectmanager/configmodel.h | |
| parent | f4cd9cdb6af19a1338a79f7c1f16964de14399de (diff) | |
CMake: Fix "CMake settings have changed on disk"
* 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>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/configmodel.h')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/configmodel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index fbe9b1b090..26f64d10a8 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -70,7 +70,8 @@ public: const QStringList &values = QStringList()); void setConfiguration(const CMakeConfig &config); void setConfiguration(const QList<DataItem> &config); - void setKitConfiguration(const QHash<QString, QString> &kitConfig); + void setConfigurationFromKit(const QHash<QString, QString> &kitConfig); + void setConfigurationForCMake(const QHash<QString, QString> &config); void flush(); void resetAllChanges(); @@ -84,7 +85,7 @@ public: static DataItem dataItemFromIndex(const QModelIndex &idx); - QList<DataItem> configurationChanges() const; + QList<DataItem> configurationForCMake() const; private: |