diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:08:25 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:08:26 +0200 |
commit | a9db7290956f5674992233d792e6dfd312ec1e53 (patch) | |
tree | a082a94d64b5a8568143f34a0f00db374e188022 /mkspecs | |
parent | d1a22bd29856807805fa56608d2953c072df0cf1 (diff) | |
parent | abfb1b8665923ce2824392f3a04e5e4ac3871017 (diff) |
Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: I41a252fdbf22551aadb0b1a6e9ecf3f95f99fbd4
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/macx.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 889027ada5..67552dcc6c 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -8,7 +8,7 @@ QMAKE_MAC_SDK = macosx QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_APPLE_DEVICE_ARCHS = x86_64 QT_MAC_SDK_VERSION_MIN = 10.13 -QT_MAC_SDK_VERSION_MAX = 10.14 +QT_MAC_SDK_VERSION_MAX = 10.15 device.sdk = macosx device.target = device |