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

4 files changed, 28 insertions, 29 deletions

diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 49b2c3a2ee..0a2e4122f5 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -52,3 +52,11 @@ macx-xcode {
         }
     }
 }
+
+!xcodebuild:equals(TEMPLATE, app):!isEmpty(QMAKE_INFO_PLIST) {
+    # Only link in photo library support if Info.plist contains
+    # NSPhotoLibraryUsageDescription. Otherwise it will be rejected from AppStore.
+    plist_path = $$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_)
+    system("/usr/libexec/PlistBuddy -c 'Print NSPhotoLibraryUsageDescription' $$system_quote($$plist_path) &>/dev/null"): \
+        QTPLUGIN += qiosnsphotolibrarysupport
+}
diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf
index 908828be18..00e29a5c8b 100644
--- a/mkspecs/features/uikit/default_pre.prf
+++ b/mkspecs/features/uikit/default_pre.prf
@@ -1,22 +1,25 @@
+sim_and_dev = false
+!isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
+    sim_and_dev = true
 
-load(default_pre)
-
-!isEmpty(QT_VERSION) {
-    qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
-        CONFIG += device $${device.sdk}
-    qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
-        CONFIG += simulator $${simulator.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
+    CONFIG += device $${device.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
+    CONFIG += simulator $${simulator.sdk}
 
-    qtConfig(simulator_and_device) {
-        # For a simulator_and_device build all the config tests
-        # are based on the device's ARM SDK, but we know that the simulator
-        # is Intel and that we support SSE/SSE2.
-        QT_CPU_FEATURES.$$QT_ARCH += sse sse2
-        CONFIG += sse sse2
-        DEFINES += QT_COMPILER_SUPPORTS_SSE2
-    }
+$$sim_and_dev {
+    # For a simulator_and_device build all the config tests
+    # are based on the device's ARM SDK, but we know that the simulator
+    # is Intel and that we support SSE/SSE2.
+    QT_CPU_FEATURES.$$QT_ARCH += sse sse2
+    CONFIG += sse sse2
+    DEFINES += QT_COMPILER_SUPPORTS_SSE2
 }
 
+unset(sim_and_dev)
+
+load(default_pre)
+
 # Check for supported Xcode versions
 lessThan(QMAKE_XCODE_VERSION, "4.3"): \
     error("This mkspec requires Xcode 4.3 or later")
diff --git a/mkspecs/features/uikit/resolve_config.prf b/mkspecs/features/uikit/resolve_config.prf
index 868813dcbd..e3c9ae23a9 100644
--- a/mkspecs/features/uikit/resolve_config.prf
+++ b/mkspecs/features/uikit/resolve_config.prf
@@ -11,7 +11,7 @@ load(resolve_config)
 !macx-xcode:xcodebuild {
     # Switch the order to make sure that the first Makefile target is the right one
     !qtConfig(simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
-        addExclusiveBuilds(simulator, device)
+        addExclusiveBuildsProper(simulator_and_device, simulator device)
     else: \
-        addExclusiveBuilds(device, simulator)
+        addExclusiveBuildsProper(simulator_and_device, device simulator)
 }
diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf
index 0ab553f587..0bfc26211a 100644
--- a/mkspecs/features/uikit/sdk.prf
+++ b/mkspecs/features/uikit/sdk.prf
@@ -1,15 +1,3 @@
-
-# In case the user sets the SDK manually
-contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) {
-    !isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
-        error("Simulator is handled automatically for simulator_and_device")
-
-    CONFIG += simulator $${simulator.sdk}
-}
-
-build_pass:!simulator_and_device:simulator: \
-    QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk},
-
 load(sdk)
 
 macx-xcode {