Merge remote-tracking branch 'origin/4.2'

Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
2016-11-14 11:15:40 +02:00
parent 1a2f649b70 b5f587efb5
commit 9c09ca9e42
175 changed files with 2145 additions and 1563 deletions
--- a/src/plugins/cmakeprojectmanager/builddirreader.h
+++ b/src/plugins/cmakeprojectmanager/builddirreader.h
@@ -83,6 +83,7 @@ public:
        QString platform;
        QString toolset;
        QStringList generatorArguments;
+        bool isAutorun = false;
    };

    static BuildDirReader *createReader(const BuildDirReader::Parameters &p);