Merge 2.0 into master

Change-Id: I8356c049251d49b3d51526a32d43842a4644c8cb

8 files changed, 18 insertions, 9 deletions

diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index ccd08febd..92d5fda71 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -211,7 +211,9 @@ ModuleProvider {
                 continue;
             }
             if (packageName.startsWith("Qt")) {
-                setupQt(pkg);
+                if (!sysroot) {
+                    setupQt(pkg);
+                }
                 continue;
             }
             var moduleName = getModuleName(moduleMapping[packageName]
diff --git a/share/qbs/modules/codesign/apple.qbs b/share/qbs/modules/codesign/apple.qbs
index 72384a06a..0d1335d92 100644
--- a/share/qbs/modules/codesign/apple.qbs
+++ b/share/qbs/modules/codesign/apple.qbs
@@ -181,7 +181,7 @@ CodeSignModule {
     }
 
     readonly property string _embeddedProfileName:
-        (xcode._platformProps || {})["EMBEDDED_PROFILE_NAME"]
+        (xcode._platformProps || {})["EMBEDDED_PROFILE_NAME"] || "embedded.mobileprovision"
 
     setupBuildEnvironment: {
         var prefixes = product.xcode ? [
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 747c6c9ee..d9213e951 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -377,6 +377,9 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat
 
         var minimumWindowsVersion = product.cpp.minimumWindowsVersion;
         if (minimumWindowsVersion) {
+            // workaround for QBS-1724, mingw seems to be broken
+            if (Utilities.versionCompare(minimumWindowsVersion, "6.2") > 0)
+                minimumWindowsVersion = "6.2";
             var subsystemVersion = WindowsUtils.getWindowsVersionInFormat(minimumWindowsVersion, 'subsystem');
             if (subsystemVersion) {
                 var major = subsystemVersion.split('.')[0];
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index feae266bf..de74e9206 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -95,12 +95,12 @@ QVariantMap certificateInfo(const QByteArray &data)
             map.insert(QString::fromUtf8(attr), cert.subjectInfo(attr).front());
         return map;
     };
-
+    const auto sha1 = QString::fromLatin1(cert.digest(QCryptographicHash::Sha1).toHex().toUpper());
     return {
-        {QStringLiteral("SHA1"), cert.digest(QCryptographicHash::Sha1).toHex().toUpper()},
+        {QStringLiteral("SHA1"), sha1},
         {QStringLiteral("subjectInfo"), subjectInfo(cert)},
-        {QStringLiteral("validBefore"), cert.effectiveDate()},
-        {QStringLiteral("validAfter"), cert.expiryDate()}
+        {QStringLiteral("validAfter"), cert.effectiveDate()},
+        {QStringLiteral("validBefore"), cert.expiryDate()}
     };
 }
 
diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp
index ea0b239fa..b6d9b61a2 100644
--- a/src/lib/corelib/tools/scripttools.cpp
+++ b/src/lib/corelib/tools/scripttools.cpp
@@ -230,6 +230,8 @@ JSValue makeJsVariant(JSContext *ctx, const QVariant &v)
         return JS_NewBool(ctx, v.toBool());
     case QMetaType::QVariantMap:
         return makeJsVariantMap(ctx, v.toMap());
+    case QMetaType::QByteArray:
+        QBS_ASSERT(!"QByteArray is not a valid type for JS variant", return JS_UNDEFINED);
     default:
         return JS_UNDEFINED;
     }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
index c12c13790..b2b67642a 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
@@ -17,9 +17,9 @@ CppApplication {
 
     Properties {
         condition: qbs.targetOS.includes("windows")
-        cpp.minimumWindowsVersion: "6.0"
+        cpp.minimumWindowsVersion: "6.2"
         cpp.defines: [
-            "QBS_WINVER=0x600",
+            "QBS_WINVER=0x602",
             "TOOLCHAIN_INSTALL_PATH=" + Utilities.cStringQuote(cpp.toolchainInstallPath)
         ]
     }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 7d743c584..fd81dd494 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -8222,7 +8222,7 @@ void TestBlackbox::minimumSystemVersion_data()
             return "__MAC_OS_X_VERSION_MIN_REQUIRED=1070\nversion 10.7\n";
 
         if (HostOsInfo::isWindowsHost())
-            return "WINVER=1536\n6.00 operating system version\n6.00 subsystem version\n";
+            return "WINVER=1538\n6.02 operating system version\n6.02 subsystem version\n";
 
         return "";
     }();
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index e42ca26c1..53738f46c 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -392,6 +392,8 @@ void TestBlackboxQt::pkgconfigQt_data()
     QTest::newRow("pkgconfig") << QStringList() << true;
     QTest::newRow("dummy")
             << QStringList({"products.p.qbsModuleProviders:dummyProvider"}) << false;
+    QTest::newRow("cross-compiling")
+            << QStringList({"moduleProviders.qbspkgconfig.sysroot:/some/fake/sysroot"}) << false;
 }
 
 void TestBlackboxQt::pluginMetaData()