Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
2016-05-27 12:01:36 +02:00
parent 1b9b59a45f b67b3160b6
commit 0c5bae640b
70 changed files with 1243 additions and 339 deletions
--- a/src/plugins/cmakeprojectmanager/configmodel.h
+++ b/src/plugins/cmakeprojectmanager/configmodel.h
@@ -55,6 +55,10 @@ public:
    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;

+    void appendConfiguration(const QString &key,
+                             const QString &value = QString(),
+                             const DataItem::Type type = DataItem::UNKNOWN,
+                             const QString &description = QString());
    void setConfiguration(const QList<DataItem> &config);
    void flush();
    void resetAllChanges();