forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user