Fix windows archive creation

Apparently, windeployqt copies all resources into the directory of the
first binary it encounters on the command line. So make sure that binary
is qbs.exe and not one of our plugins, as we want the libs to end up
under bin/.

Change-Id: Ib23f1b355a058ca1deec5e10535c68dc9170a2bf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 7 insertions, 0 deletions

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(" ");