Merge remote-tracking branch 'origin/3.1'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -342,11 +342,6 @@ bool CMakeProject::parseCMakeLists()
         part->displayName = displayName();
         part->projectFile = projectFilePath();
 
-        part->evaluateToolchain(tc,
-                                cxxflags,
-                                cxxflags,
-                                SysRootKitInformation::sysRoot(k));
-
         // This explicitly adds -I. to the include paths
         part->includePaths += projectDirectory();
 
@@ -371,6 +366,11 @@ bool CMakeProject::parseCMakeLists()
         foreach (const QString &file, m_files)
             adder.maybeAdd(file);
 
+        part->evaluateToolchain(tc,
+                                cxxflags,
+                                cxxflags,
+                                SysRootKitInformation::sysRoot(k));
+
         pinfo.appendProjectPart(part);
         m_codeModelFuture.cancel();
         m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);