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

Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/sdk.prf
	src/angle/src/libEGL/libEGL.pro
	src/platformsupport/fontdatabases/fontdatabases.pro
	src/platformsupport/platformsupport.pro
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	tests/auto/widgets/widgets/qmenubar/BLACKLIST
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c

5 files changed, 15 insertions, 5 deletions

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index c799487354..33dffe603e 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -66,7 +66,7 @@ macx-xcode {
     QMAKE_MAC_XCODE_SETTINGS += only_active_arch
 } else {
     VALID_ARCHS =
-    !simulator|simulator_and_device: VALID_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
+    device|!simulator: VALID_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
     simulator: VALID_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
 
     single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index 2064d976d7..e21e749ee9 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -1,4 +1,4 @@
-CONFIG = asset_catalogs sdk rez $$CONFIG
+CONFIG = asset_catalogs rez $$CONFIG
 load(default_pre)
 
 isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf
index b3b1d4be99..ed1ad8ad38 100644
--- a/mkspecs/features/mac/objective_c.prf
+++ b/mkspecs/features/mac/objective_c.prf
@@ -1,6 +1,7 @@
 
 # Objective-C/C++ sources go in SOURCES, like all other sources
 SOURCES += $$OBJECTIVE_SOURCES
+unset(OBJECTIVE_SOURCES)
 
 # Strip C/C++ flags from QMAKE_OBJECTIVE_CFLAGS just in case
 QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
@@ -8,3 +9,4 @@ QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
 # Add Objective-C/C++ flags to C/C++ flags, the compiler can handle it
 QMAKE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
 QMAKE_CXXFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
+unset(QMAKE_OBJECTIVE_CFLAGS)
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index bea46fa8cb..be885e52ee 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -54,24 +54,27 @@ for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_
     tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
     watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
 
-    !simulator|simulator_and_device: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS
+    device|!simulator: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS
     simulator: simulator_archs = $$QMAKE_APPLE_SIMULATOR_ARCHS
     archs = $$device_archs $$simulator_archs
 
+    isEmpty(archs): \
+        error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
+
     single_arch {
         device_archs = $$first(device_archs)
         simulator_archs = $$first(simulator_archs)
         archs = $$first(archs)
     }
 
-    # If we're doing a simulator_and_device build, device and simulator architectures
+    # If we're doing a simulator and device build, device and simulator architectures
     # use different paths and flags for the sysroot and deployment target switch, so we
     # must multiplex them across multiple architectures using -Xarch. Otherwise we fall
     # back to the simple path. This is not strictly necessary but results in cleaner
     # command lines and makes it easier for people to override EXPORT_VALID_ARCHS to
     # limit individual rules to a different set of architecture(s) from the overall
     # build (such as machtest in QtCore).
-    simulator_and_device {
+    simulator:device {
         QMAKE_XARCH_CFLAGS =
         QMAKE_XARCH_LFLAGS =
         QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf
new file mode 100644
index 0000000000..df191eb13c
--- /dev/null
+++ b/mkspecs/features/mac/toolchain.prf
@@ -0,0 +1,5 @@
+# Ensure that we process sdk.prf first, as it will update QMAKE_CXX,
+# which the default path determination uses.
+sdk: load(sdk)
+
+load(toolchain)