diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:30:21 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:32:02 +0300 |
| commit | 687466ac4748c82d8a56aff3f2f5901f929a4bcd (patch) | |
| tree | 426992ddc3e43b5d5522a781065287beaee5e0a0 /qbs | |
| parent | f047e1a2a2ac6667d7d19c95e3f6bb96e17f2a5a (diff) | |
| parent | b89888ca9d6d10c850619c726e38584ca6637578 (diff) | |
| download | qt-creator-687466ac4748c82d8a56aff3f2f5901f929a4bcd.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 03670f2902..bbef04d175 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -15,7 +15,6 @@ QtcProduct { project.buildDirectory + '/' + qtc.ide_library_path, project.buildDirectory + '/' + qtc.ide_plugin_path ] - cpp.minimumOsxVersion: "10.7" cpp.defines: base.filter(function(d) { return d != "QT_RESTRICTED_CAST_FROM_ASCII"; }) Group { diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 690880d572..52e63f1f6f 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -1,5 +1,6 @@ import qbs 1.0 import qbs.FileInfo +import qbs.Utilities import QtcFunctions Product { @@ -19,9 +20,13 @@ Product { Depends { name: "qtc" } Depends { name: product.name + " dev headers"; required: false } + Properties { + condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 + cpp.minimumMacosVersion: "10.8" + } + cpp.cxxLanguageVersion: "c++14" cpp.defines: qtc.generalDefines - cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile cpp.visibility: "minimal" |