Merge 1.13 into master

Change-Id: Ife9f7cd99dd5a531bcb670b2dfbd245471a8c379

5 files changed, 17 insertions, 7 deletions

diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat
index 865efb2fd..f4e85f63c 100644
--- a/scripts/make-release-archives.bat
+++ b/scripts/make-release-archives.bat
@@ -68,8 +68,8 @@ subst Q: "%CD%" && Q:
 qbs build --settings-dir "%builddir%\.settings"^
  -f qbs.qbs -d "%builddir%\build"^
  -p dist qbs.buildVariant:release "products.qbs archive.includeTopLevelDir:true"^
- release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^
- release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b
+ config:release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^
+ config:release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b
 
 copy /y "%builddir%\build\release\qbs.%version%.nupkg" dist || exit /b
 copy /y "%builddir%\build\release\qbs-windows-x86-%version%.zip" dist || exit /b
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs
index 77e6ef7d2..4c03d5e36 100644
--- a/src/lib/scriptengine/scriptengine.qbs
+++ b/src/lib/scriptengine/scriptengine.qbs
@@ -401,7 +401,7 @@ Project {
                     var p = new Process();
                     if (p.exec(qmake, ["-query", "QT_HOST_BINS/src"]) !== 0)
                         throw new Error("Error while querying qmake.");
-                    syncQtPath = FileInfo.joinPaths(p.readStdOut().replace(/[\r\n]/, ''),
+                    syncQtPath = FileInfo.joinPaths(p.readStdOut().replace(/\r?\n/, ''),
                                                     "syncqt.pl");
                 }
                 var qtScriptSrcPath = FileInfo.cleanPath(
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs
index 7deaddc3a..3a49fea1d 100644
--- a/src/packages/archive/archive.qbs
+++ b/src/packages/archive/archive.qbs
@@ -80,6 +80,13 @@ QbsProduct {
                 return artifact.fileTags.contains("application")
                         || artifact.fileTags.contains("dynamiclibrary");
             }).map(function(a) { return ModUtils.artifactInstalledFilePath(a); });
+            cmd.binaryFilePaths.sort(function(a1, a2) {
+                if (a1.contains("qbs.exe"))
+                    return -1;
+                if (a2.contains("qbs.exe"))
+                    return 1;
+                return 0;
+            });
             cmd.extendedDescription = FileInfo.joinPaths(
                         product.moduleProperty("Qt.core", "binPath"), "windeployqt") + ".exe " +
                     ["--json"].concat(cmd.windeployqtArgs).concat(cmd.binaryFilePaths).join(" ");
diff --git a/src/packages/chocolatey/chocolatey.qbs b/src/packages/chocolatey/chocolatey.qbs
index 17b992942..27cc1e489 100644
--- a/src/packages/chocolatey/chocolatey.qbs
+++ b/src/packages/chocolatey/chocolatey.qbs
@@ -95,7 +95,7 @@ Product {
                     tf.close();
                 }
 
-                var doc = new XmlDomDocument();
+                var doc = new Xml.DomDocument();
                 doc.load(nuspecFilePath);
                 var versionNode = doc.createElement("version");
                 versionNode.appendChild(doc.createTextNode(qbsVersion));
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 399a49b21..21f19c8a2 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6475,10 +6475,13 @@ void TestBlackbox::minimumSystemVersion_data()
     const QString unspecified = []() -> QString {
         if (HostOsInfo::isMacosHost()) {
             const auto v = defaultClangMinimumDeploymentTarget();
-            return "__MAC_OS_X_VERSION_MIN_REQUIRED="
-                    + QString::number(toMinimumDeploymentTargetValue(v, true))
-                    + "\nversion "
+            auto result = "__MAC_OS_X_VERSION_MIN_REQUIRED="
+                    + QString::number(toMinimumDeploymentTargetValue(v, true));
+            if (v < qbs::Version(10, 14)) {
+                result += "\nversion "
                     + QString::number(v.majorVersion()) + "." + QString::number(v.minorVersion());
+            }
+            return result;
         }
 
         if (HostOsInfo::isWindowsHost())