mingw: workaround for cpp.minimumWindowsVersion

It seems that mingw is broken and produces invalid
binaries when using cpp.minimumWindowsVersion >= 6.3.

Also, update minimumSystemVersion test to use 6.2
aka Windows 8.

Task-number: QBS-1724
Change-Id: Icea9b21ce6c3b7709495a28114a8c933a88b4647
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 6 insertions, 3 deletions

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