diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-28 11:32:39 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-10-06 09:53:40 +0000 |
commit | 02533e61cf617157257e048fc79812c4fb880f35 (patch) | |
tree | 95aa2e90746adb1ed1089423cf49e7ea9b514877 /src/plugins/cmakeprojectmanager/configmodel.h | |
parent | 1fa26bd9b3dd5269dc44a000cd525e26e6904328 (diff) |
CMake: Fix project parsing notification
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>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/configmodel.h')
-rw-r--r-- | src/plugins/cmakeprojectmanager/configmodel.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index 626d487ac6..6fb96e2990 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -25,6 +25,8 @@ #pragma once +#include "cmakeconfigitem.h" + #include <QAbstractTableModel> #include <utils/treemodel.h> @@ -65,6 +67,7 @@ public: const DataItem::Type type = DataItem::UNKNOWN, const QString &description = QString(), const QStringList &values = QStringList()); + void setConfiguration(const CMakeConfig &config); void setConfiguration(const QList<DataItem> &config); void setKitConfiguration(const QHash<QString, QString> &kitConfig); void flush(); @@ -80,6 +83,7 @@ public: QList<DataItem> configurationChanges() const; + private: class InternalDataItem : public DataItem { @@ -97,9 +101,9 @@ private: QString kitValue; }; - void setConfiguration(const QList<InternalDataItem> &config); void generateTree(); + void setConfiguration(const QList<InternalDataItem> &config); QList<InternalDataItem> m_configuration; QHash<QString, QString> m_kitConfiguration; |