From 5f45bb34ce49959c1b61d4af91402640d85cfd63 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Thu, 8 Jun 2017 14:36:15 -0700
Subject: [PATCH] Fix deployment target on macOS

According to the README, the minimum version is 10.8, but the code did
not reflect that reality.

Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 qbs/imports/QtcAutotest.qbs | 1 -
 qbs/imports/QtcProduct.qbs  | 7 ++++++-
 qtcreator.pri               | 2 +-
 src/app/Info.plist          | 2 +-
 src/app/app.pro             | 2 +-
 5 files changed, 9 insertions(+), 5 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"
diff --git a/qtcreator.pri b/qtcreator.pri
index f25d94536f..f5b6e55c63 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 8772259386..6d31c52d26 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist
@@ -253,6 +253,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@SHORT_VERSION@</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7.0</string>
+	<string>10.8</string>
 </dict>
 </plist>
diff --git a/src/app/app.pro b/src/app/app.pro
index eb8943f570..fee710e99d 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
-- 
GitLab