diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-08-05 11:59:28 +0300 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-05 11:40:07 +0200 |
| commit | 1853f01a5b0955a28e9c321cd36f45d5f17651bf (patch) | |
| tree | 5d357de37f3c2ef93e38bbc79ef96b6f8982cd6f /qbs | |
| parent | 713bc04ad4560123d97bb469d109a0885cf36373 (diff) | |
| parent | d004203b13fa17d1258ee62d5eb4f681adf32398 (diff) | |
| download | qt-creator-1853f01a5b0955a28e9c321cd36f45d5f17651bf.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 5 | ||||
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 84806a6f30..5f11e136ee 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -25,7 +25,10 @@ QtcProduct { name: "Qt.test" } - cpp.internalVersion: "" + Properties { + condition: qbs.targetOS.contains("unix") + cpp.internalVersion: "" + } cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index fee3782c8c..bb6828e97a 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -21,12 +21,6 @@ Product { cpp.cxxLanguageVersion: "c++11" cpp.defines: qtc.generalDefines - cpp.linkerFlags: { - var flags = []; - if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) - flags.push("-Wl,-s"); - return flags; - } cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile |