feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix "CMake settings have changed on disk"

Browse Source 
* 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>
This commit is contained in:
Tobias Hunger
2017-09-29 23:34:52 +02:00
parent f4cd9cdb6a
commit 3f73f3a4f4
5 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/configmodel.h
View File

@@ -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: