diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
| commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
| tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /mkspecs/common | |
| parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
| parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/macx.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 8122a54d9d..6e95112f9b 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -7,6 +7,7 @@ QMAKE_MAC_SDK = macosx QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_APPLE_DEVICE_ARCHS = x86_64 +QT_MAC_SDK_VERSION_TESTED_WITH = 10.13 device.sdk = macosx device.target = device |