diff options
author | Yuchen Deng <loaden@gmail.com> | 2014-04-17 18:44:01 +0800 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-22 10:24:10 +0200 |
commit | c92288731535c9e3983480427a36e1d6867b1d5a (patch) | |
tree | 5a4602180ea024bed482161581eb2976ff4f343e /qbs | |
parent | 6827072facb8c20d2437191ac9847fa30523ad67 (diff) | |
download | qt-creator-c92288731535c9e3983480427a36e1d6867b1d5a.tar.gz |
qbs: Fix link warning
for targeting xp 64bit, it's should be 5.2 (5.02)
LINK : warning LNK4010: invalid subsystem version number 5.01;
default subsystem version assumed
Change-Id: I8683a70148208ff399c6dfe3bd299b6b81206e32
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'qbs')
-rw-r--r-- | qbs/imports/QtcLibrary.qbs | 2 | ||||
-rw-r--r-- | qbs/imports/QtcPlugin.qbs | 2 | ||||
-rw-r--r-- | qbs/imports/QtcTool.qbs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index bde1ea2812..54f79a3618 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -24,7 +24,7 @@ DynamicLibrary { : ["$ORIGIN", "$ORIGIN/.."] property string libIncludeBase: ".." // #include <lib/header.h> cpp.includePaths: [libIncludeBase] - cpp.minimumWindowsVersion: "5.1" + cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Export { Depends { name: "cpp" } diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index cde595bbcb..33e0c633f4 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -36,7 +36,7 @@ Product { property string pluginIncludeBase: ".." // #include <plugin/header.h> cpp.includePaths: [pluginIncludeBase] - cpp.minimumWindowsVersion: "5.1" + cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Group { name: "PluginSpec" diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index f5d4d95e0a..12f30f8950 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -14,7 +14,7 @@ Application { cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../" + project.ide_library_path] : ["$ORIGIN/../" + project.ide_library_path] - cpp.minimumWindowsVersion: "5.1" + cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" Group { fileTagsFilter: product.type |