diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
| commit | 0fb641c90e64054a28a39e3f48d96f953399805a (patch) | |
| tree | 504f097db01334a87316f8e825f1db0cba6bfba1 /qbs | |
| parent | f4520bafaccb0832266f8d88f254e910ed7a23f4 (diff) | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
| download | qt-creator-0fb641c90e64054a28a39e3f48d96f953399805a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
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 9de9cbb934..ec10919caa 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -27,7 +27,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 a27c2fb270..3fb2b2c2ec 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -39,7 +39,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 a08032fe39..0c1433df8d 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -18,7 +18,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 |