diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-01-18 16:56:00 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-01-20 12:48:22 +0000 |
| commit | 087d6d7472676ad0ef30b78359ad81d692a9fd57 (patch) | |
| tree | 2de603b7868bf0133d7ecbb43ad08fa0e2c9ca84 /src/plugins/cmakeprojectmanager/configmodel.h | |
| parent | fb55efd9e2a5a103e38647244ebf1f6bfe0b0ef5 (diff) | |
CMake: Mark changes to CMake configuration that contradicts a kit
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>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/configmodel.h')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/configmodel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index 3730ac380e..94fef0b664 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -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 |