Merge branch '1.3' into master.

Conflicts:
	qbs_version.pri
	src/app/qbs/commandlinefrontend.cpp
	src/lib/corelib/language/projectresolver.cpp
	version.js

Change-Id: I6b8a09faed7970821955ac329b0c244ddffb037c

1 files changed, 8 insertions, 2 deletions

diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index dab6d4b71..9fa440af3 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -256,6 +256,12 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath)
     return qtEnvironment;
 }
 
+static bool isToolchainProfileKey(const QString &key)
+{
+    // The Qt profile setup itself sets cpp.minimum*Version for some systems.
+    return key.startsWith(QLatin1String("cpp.")) && !key.startsWith("cpp.minimum");
+}
+
 void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironment &qtEnvironment,
                                 Settings *settings)
 {
@@ -276,7 +282,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen
         return;
     QStringList toolchainProfiles;
     foreach (const QString &key, profile.allKeys(Profile::KeySelectionNonRecursive)) {
-        if (key.startsWith(QLatin1String("cpp.")))
+        if (isToolchainProfileKey(key))
             return;
     }
 
@@ -287,7 +293,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen
         bool hasCppKey = false;
         bool hasQtKey = false;
         foreach (const QString &key, otherProfile.allKeys(Profile::KeySelectionNonRecursive)) {
-            if (key.startsWith(QLatin1String("cpp."))) {
+            if (isToolchainProfileKey(key)) {
                 hasCppKey = true;
             } else if (key.startsWith(QLatin1String("Qt."))) {
                 hasQtKey = true;