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/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -341,8 +341,10 @@ void CMakeProject::runCMake()
        return;

    BuildDirManager *bdm = bc->buildDirManager();
-    if (bdm && !bdm->isParsing())
+    if (bdm && !bdm->isParsing()) {
+        bdm->checkConfiguration();
        bdm->forceReparse();
+    }
 }

 QList<CMakeBuildTarget> CMakeProject::buildTargets() const