diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index 03670f29029e6646d8f4a0c1cdc1bd004ecd091f..bbef04d1751d4215577383bc27608ea5cd6a7bcf 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 690880d572901223ff55aeefcf541242c2e0dc8c..52e63f1f6f3fbb36a6d545b7b83615959799894f 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"
diff --git a/qtcreator.pri b/qtcreator.pri
index f25d94536f850e0423244aa705925ccb34e563ed..f5b6e55c63c8685bfb3515efdeaea0d2255dccdf 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -59,7 +59,7 @@ defineReplace(stripSrcDir) {
return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_))
}
-macos:!minQtVersion(5, 7, 0) {
+darwin:!minQtVersion(5, 7, 0) {
# Qt 5.6 still sets deployment target 10.7, which does not work
# with all C++11/14 features (e.g. std::future)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
diff --git a/src/app/Info.plist b/src/app/Info.plist
index 8772259386af139259b01e6ab0fc3c27a5c1f4ce..6d31c52d266441484caee11ce5aecfc054d813ff 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist
@@ -253,6 +253,6 @@
CFBundleShortVersionString
@SHORT_VERSION@
LSMinimumSystemVersion
- 10.7.0
+ 10.8
diff --git a/src/app/app.pro b/src/app/app.pro
index eb8943f5706d531045af8839c47436e3140f1ebc..fee710e99d77cafc54271e2da4789335e72a2182 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -38,7 +38,7 @@ win32 {
--app-icon qtcreator \
--output-partial-info-plist $$shell_quote($(TMPDIR)/qtcreator.Info.plist) \
--platform macosx \
- --minimum-deployment-target 10.7 \
+ --minimum-deployment-target $$QMAKE_MACOSX_DEPLOYMENT_TARGET \
--compile $$shell_quote($$IDE_DATA_PATH) \
$$shell_quote($$PWD/qtcreator.xcassets) > /dev/null
ASSETCATALOG.input = ASSETCATALOG.files