diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
| commit | 7344987c20d13710af89300f9b39e06397ec592a (patch) | |
| tree | 4c12e46adefd3aee9d2ce479923fe56bab483764 /mkspecs | |
| parent | 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 (diff) | |
| parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/macx.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 6e95112f9b..d61ad33351 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -7,7 +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 +QT_MAC_SDK_VERSION_TESTED_WITH = 10.14 device.sdk = macosx device.target = device diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 353fda41e6..ae17f076a3 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -18,18 +18,16 @@ contains(TEMPLATE, .*app) { !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ CONFIG += sdk_no_version_check - !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_TESTED_WITH) { + QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\d+)(\.\d+)(\.\d+)?", \1\2) + + !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_MINOR_VERSION, $$QT_MAC_SDK_VERSION_TESTED_WITH) { warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_TESTED_WITH"\ - "of the platform SDK, you're using $${QMAKE_MAC_SDK_VERSION}.") + "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") warning("This is an unsupported configuration. You may experience build issues," \ "and by using") warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ "that Qt has not been prepared for.") - isEqual(QMAKE_MAC_SDK_VERSION, 10.14): \ - warning("E.g., 10.14 enables dark mode and layer-backed views," \ - "which Qt $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION} does not support.") - warning("Please downgrade the SDK you use to build your app to version" \ "$$QT_MAC_SDK_VERSION_TESTED_WITH, or configure") warning("with CONFIG+=sdk_no_version_check when running qmake" \ |