diff --git a/qbs/imports/QtcFunctions/functions.js b/qbs/imports/QtcFunctions/functions.js index 75fdef55d378eb3353ef6ba89a24bf63196a1e38..23a51f80e8f6858663288a8204253bfb89005e23 100644 --- a/qbs/imports/QtcFunctions/functions.js +++ b/qbs/imports/QtcFunctions/functions.js @@ -22,25 +22,3 @@ function versionIsAtLeast(actualVersion, expectedVersion) } 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; -} - diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 7372fa76987e3a5ad07d351430a62c3596e4b101..d38b7b0ecbb226debeeb3bcac052736454c95a2c 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -6,9 +6,9 @@ Product { Depends { name: "cpp" } cpp.defines: project.generalDefines - cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs) + cpp.cxxLanguageVersion: "c++11" cpp.linkerFlags: { - var flags = QtcFunctions.commonLinkerFlags(qbs); + var flags = []; if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) flags.push("-Wl,-s"); return flags;