Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/corelib/serialization/qcborcommon.h
	src/corelib/tools/qlocale_data_p.h
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416

4 files changed, 17 insertions, 9 deletions

diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
index d61ad33351..889027ada5 100644
--- a/mkspecs/common/macx.conf
+++ b/mkspecs/common/macx.conf
@@ -7,7 +7,8 @@ QMAKE_MAC_SDK           = macosx
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 QMAKE_APPLE_DEVICE_ARCHS = x86_64
-QT_MAC_SDK_VERSION_TESTED_WITH = 10.14
+QT_MAC_SDK_VERSION_MIN = 10.13
+QT_MAC_SDK_VERSION_MAX = 10.14
 
 device.sdk = macosx
 device.target = device
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index 8c6c87d0b7..5b6a9bfcfa 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -24,5 +24,9 @@ QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
 QMAKE_NM                = $${CROSS_COMPILE}nm -P
 QMAKE_STRIP             = $${CROSS_COMPILE}strip
 
+# modifications to gcc-base.conf
+QMAKE_AR_LTCG           = $${CROSS_COMPILE}gcc-ar cqs
+QMAKE_NM_LTCG           = $${CROSS_COMPILE}gcc-nm -P
+
 contains(DISTRO_OPTS, deb-multi-arch): \
     QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index ae17f076a3..99f68b78f5 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -3,25 +3,28 @@ load(default_post)
 contains(TEMPLATE, .*app) {
     !macx-xcode {
         # Detect changes to the platform SDK
-        QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION
+        QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH
         QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
     }
 
     # Detect incompatible SDK versions
 
-    !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION): \
-        warning("Qt requires at least version $$QT_MAC_SDK_VERSION of the platform SDK," \
+    isEmpty(QT_MAC_SDK_VERSION_MIN): \
+        QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION
+
+    !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \
+        warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \
               "you're using $${QMAKE_MAC_SDK_VERSION}. Please upgrade.")
 
-    !isEmpty(QT_MAC_SDK_VERSION_TESTED_WITH) {
+    !isEmpty(QT_MAC_SDK_VERSION_MAX) {
         # For Qt developers only
         !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \
             CONFIG += sdk_no_version_check
 
         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"\
+        !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_MINOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) {
+            warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\
                     "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")
@@ -29,7 +32,7 @@ contains(TEMPLATE, .*app) {
                     "that Qt has not been prepared for.")
 
             warning("Please downgrade the SDK you use to build your app to version" \
-                    "$$QT_MAC_SDK_VERSION_TESTED_WITH, or configure")
+                    "$$QT_MAC_SDK_VERSION_MAX, or configure")
             warning("with CONFIG+=sdk_no_version_check when running qmake" \
                     "to silence this warning.")
         }
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index a7c8268da5..c0266f2139 100644
--- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk
@@ -1,4 +1,4 @@
-CURRENT_MAC_SDK_VERSION := $(shell /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version)
+CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version)
 
 ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
     $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)