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

CMake: Mark changes to CMake configuration that contradicts a kit

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2017-01-18 16:56:00 +01:00
parent fb55efd9e2
commit 087d6d7472
4 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ public:
const QString &description = QString(),
const QStringList &values = QStringList());
void setConfiguration(const QList<DataItem> &config);
void setKitConfiguration(const QHash<QString, QString> &kitConfig);
void flush();
void resetAllChanges();
@@ -84,6 +85,7 @@ private:
InternalDataItem(const InternalDataItem &item) = default;
QString toolTip() const;
QString currentValue() const;
bool isUserChanged = false;
bool isUserNew = false;
@@ -94,6 +96,7 @@ private:
InternalDataItem &itemAtRow(int row);
const InternalDataItem &itemAtRow(int row) const;
QList<InternalDataItem> m_configuration;
QHash<QString, QString> m_kitConfiguartion;
};
} // namespace CMakeProjectManager