feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Make use of cpp.cxxLanguageVersion.

Browse Source 
Change-Id: Ia2f1870ec67ced58ad95bc6e1953575df2b88cd8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-01-20 17:45:45 +01:00
parent daac058f00
commit c0c9a83409
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qbs/imports/QtcFunctions/functions.js
View File

@@ -22,25 +22,3 @@ function versionIsAtLeast(actualVersion, expectedVersion)
} }
return i === expectedVersionParts.length || expectedVersionParts[i] === 0; return i === expectedVersionParts.length || expectedVersionParts[i] === 0;
} }
function commonCxxFlags(qbs)
{
var flags = [];
if (qbs.toolchain.contains("clang")) {
flags.push("-std=c++11");
if (qbs.targetOS.contains("darwin"))
flags.push("-stdlib=libc++");
} else if (qbs.toolchain.contains("gcc")) {
flags.push("-std=c++0x");
}
return flags;
}
function commonLinkerFlags(qbs)
{
var flags = [];
if (qbs.toolchain.contains("clang") && qbs.targetOS.contains("darwin"))
flags.push("-stdlib=libc++");
return flags;
}

4
qbs/imports/QtcProduct.qbs
View File

@@ -6,9 +6,9 @@ Product {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.defines: project.generalDefines cpp.defines: project.generalDefines
cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs) cpp.cxxLanguageVersion: "c++11"
cpp.linkerFlags: { cpp.linkerFlags: {
var flags = QtcFunctions.commonLinkerFlags(qbs); var flags = [];
if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
flags.push("-Wl,-s"); flags.push("-Wl,-s");
return flags; return flags;