diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-04-11 00:19:02 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-04-11 15:09:25 +0000 |
| commit | 978448ddfe8aac9c4cc895f6c93429e0f9f689bc (patch) | |
| tree | 0f71a8ef3404dc2f3c705c772be384829a76ff63 /share | |
| parent | da4d41e6248fcdcd6938c00062366990e04af39b (diff) | |
| download | qbs-978448ddfe8aac9c4cc895f6c93429e0f9f689bc.tar.gz | |
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>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 3 |
1 files changed, 3 insertions, 0 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]; |