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

Blacklists tst_Accessibility::focusChild() for now.

Conflicts:
	src/core/api/core_api.pro
	src/core/net/plugin_response_interceptor_url_loader_throttle.h
	src/process/process.pro

Change-Id: I95821a3851120dc16673f4c760e802952eae5c41

1 files changed, 8 insertions, 5 deletions

diff --git a/configure.pri b/configure.pri
index f1c25fbe1..46ce376ef 100644
--- a/configure.pri
+++ b/configure.pri
@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
 defineTest(qtConfTest_detectPlatform) {
     QT_FOR_CONFIG += gui-private
 
-    !linux:!win32:!macos {
+    !linux:!win32:!macos:!ios {
         qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
     } else {
         linux:qtwebengine_isLinuxPlatformSupported() {
@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {
         macos:qtwebengine_isMacOsPlatformSupported() {
             $${1}.platform = "macos"
         }
+        ios:qtwebengine_isMacOsPlatformSupported() {
+            $${1}.platform = "ios"
+        }
     }
 
     !isEmpty(platformError) {
@@ -429,21 +432,21 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
 defineTest(qtwebengine_isMacOsPlatformSupported) {
     # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
     !qtwebengine_isMinXcodeVersion(8, 3, 3) {
-        qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")
+        qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine or Qt Pdf.")
         return(false)
     }
     !clang|intel_icc {
-        qtwebengine_platformError("Qt WebEngine on macOS requires Clang.")
+        qtwebengine_platformError("Qt WebEngine and Qt Pdf requires Clang.")
         return(false)
     }
     # We require macOS 10.12 (darwin version 16.0.0) or newer.
     darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
     lessThan(darwin_major_version, 16) {
-        qtwebengine_platformError("Building Qt WebEngine requires macOS version 10.12 or newer.")
+        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires macOS version 10.12 or newer.")
         return(false)
     }
     !qtwebengine_isMinOSXSDKVersion(10, 12): {
-        qtwebengine_platformError("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
         return(false)
     }
     return(true)