diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:02 +0100 |
commit | 78c687f98eabb3da00026ac2375cdb4bb5770a0a (patch) | |
tree | 0bd20a65aa9051229e813bc6b09cb59f8b5778f1 /mkspecs/common/macx.conf | |
parent | 3e529369eb16704aa0d601a7f4b8e490dc8b772c (diff) | |
parent | a866055d18b2c2efc0f3cf5307d8eac78cce26eb (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I963b5f48b5d6f3500ca379fbd7f1a4290b570175
Diffstat (limited to 'mkspecs/common/macx.conf')
-rw-r--r-- | mkspecs/common/macx.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 67552dcc6c..d16b77acb8 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -5,9 +5,13 @@ QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 QMAKE_APPLE_DEVICE_ARCHS = x86_64 -QT_MAC_SDK_VERSION_MIN = 10.13 + +# Should be 10.15, but as long as the CI builds with +# older SDKs we have to keep this. +QT_MAC_SDK_VERSION_MIN = 10.14 + QT_MAC_SDK_VERSION_MAX = 10.15 device.sdk = macosx |