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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/util/util.pri
	tests/auto/corelib/thread/qthread/qthread.pro
	tests/auto/corelib/thread/qthread/tst_qthread.cpp

Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b

7 files changed, 95 insertions, 45 deletions

diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf
index 45eadc9fdb..1dc8f87313 100644
--- a/mkspecs/features/android/android.prf
+++ b/mkspecs/features/android/android.prf
@@ -1,6 +1,3 @@
-android_install:contains(INSTALLS, target):!isEmpty(target.path): \
-    CONFIG -= android_install
-
 contains(TEMPLATE, ".*app") {
     !android_app {
         !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so
@@ -11,7 +8,7 @@ contains(TEMPLATE, ".*app") {
             INSTALLS *= target
         }
     }
-} else: contains(TEMPLATE, "lib"):!static:android_install {
+} else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install {
     target.path = /libs/$$ANDROID_TARGET_ARCH/
     INSTALLS *= target
 }
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 395ac34001..e645ba5803 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -183,6 +183,7 @@ macx-xcode {
 }
 
 cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-cache(QMAKE_XCODE_VERSION, stash)
+!isEmpty(QMAKE_XCODE_VERSION): \
+    cache(QMAKE_XCODE_VERSION, stash)
 
 QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e21e749ee9..44636f2288 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -10,18 +10,23 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
     # Make sure Xcode path is valid
     !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
-
-    # Make sure Xcode is set up properly
-    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
-        error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
 }
 
-isEmpty(QMAKE_XCODE_VERSION) {
-    # Extract Xcode version using xcodebuild
-    xcode_version = $$system("/usr/bin/xcodebuild -version")
-    QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
-    isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
-    unset(xcode_version)
+isEmpty(QMAKE_XCODEBUILD_PATH): \
+    QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")
+
+!isEmpty(QMAKE_XCODEBUILD_PATH) {
+    # Make sure Xcode is set up properly
+    !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \
+        error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")
+
+    isEmpty(QMAKE_XCODE_VERSION) {
+        # Extract Xcode version using xcodebuild
+        xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")
+        QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
+        isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
+        unset(xcode_version)
+    }
 }
 
 isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 68ab7e4053..3f6dc076ca 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -7,13 +7,22 @@ contains(QMAKE_MAC_SDK, .*/.*): \
 
 defineReplace(xcodeSDKInfo) {
     info = $$1
+    equals(info, "Path"): \
+        info = --show-sdk-path
+    equals(info, "PlatformPath"): \
+        info = --show-sdk-platform-path
+    equals(info, "SDKVersion"): \
+        info = --show-sdk-version
     sdk = $$2
     isEmpty(sdk): \
         sdk = $$QMAKE_MAC_SDK
 
     isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
-        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null")
-        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'")
+        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
+        # --show-sdk-platform-path won't work for Command Line Tools; this is fine
+        # only used by the XCTest backend to testlib
+        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
+            error("Could not resolve SDK $$info for \'$$sdk\'")
         cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
     }
 
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 34bd8f1d78..eb7b1385f2 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -25,9 +25,11 @@ isEmpty($${target_prefix}.INCDIRS) {
         !equals(QMAKE_HOST.os, Windows) {
             cmd_prefix = "LC_ALL=C"
             cmd_suffix = "</dev/null >/dev/null"
+            null_file = /dev/null
         } else {
             cmd_prefix = "set LC_ALL=C&"
             cmd_suffix = "<NUL >NUL"
+            null_file = NUL
         }
 
         cxx_flags = $$QMAKE_CXXFLAGS
@@ -38,9 +40,17 @@ isEmpty($${target_prefix}.INCDIRS) {
         # While technically incorrect but without any likely practical effect,
         # UIKit simulator platforms will see the device SDK's sysroot in
         # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass.
-        darwin: cxx_flags += -isysroot $$QMAKE_MAC_SDK_PATH
+        darwin {
+            uikit:macx-xcode: \
+                cxx_flags += -isysroot $$sdk_path_device.value
+            else: \
+                cxx_flags += -isysroot $$QMAKE_MAC_SDK_PATH
+        }
 
-        clang: \
+        rim_qcc: \
+            # Need the cc1plus and ld command lines to pick up the paths
+            cxx_flags += $$QMAKE_LFLAGS_SHLIB -o $$null_file -v
+        else: clang: \
             # Need to link to pick up library paths
             cxx_flags += $$QMAKE_LFLAGS_SHLIB -o /dev/null -v -Wl,-v
         else: \
@@ -50,33 +60,60 @@ isEmpty($${target_prefix}.INCDIRS) {
         output = $$system("$$cmd_prefix $$QMAKE_CXX $$qtMakeExpand($$cxx_flags) -xc++ - 2>&1 $$cmd_suffix", lines, ec)
         !equals(ec, 0): \
             error("Cannot run compiler '$$QMAKE_CXX'. Maybe you forgot to setup the environment?")
-        add_includes = false
-        add_libraries = false
-        for (line, output) {
-            line ~= s/^[ \\t]*//  # remove leading spaces
-            contains(line, "LIBRARY_PATH=.*") {
-                line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
-                paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-                for (path, paths): \
-                    QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path)
-            } else: contains(line, "Library search paths:") {
-                add_libraries = true
-            } else: contains(line, "$${LITERAL_HASH}include <.*") {  # #include <...> search starts here:
-                add_includes = true
-            } else: contains(line, "End of search.*") {
-                add_includes = false
-            } else: $$add_libraries {
-                # We assume all library search paths are absolute
-                !contains(line, "^/.*") {
-                    add_libraries = false
-                    next()
+
+        rim_qcc {
+            for (line, output) {
+                contains(line, "^[^ ]*cc1plus .*") {
+                    take_next = false
+                    for (parameter, $$list($$line)) {
+                        $$take_next {
+                            QMAKE_DEFAULT_INCDIRS += $$clean_path($$parameter)
+                            take_next = false
+                        } else: equals(parameter, "-isystem") {
+                            take_next = true
+                        }
+                    }
+                } else: contains(line, "^[^ ]*-ld .*") {
+                    for (parameter, $$list($$line)) {
+                        contains(parameter, "^-L.*") {
+                            parameter ~= s/^-L//
+                            QMAKE_DEFAULT_LIBDIRS += $$clean_path($$parameter)
+                        }
+                    }
+                }
+            }
+        } else {
+            add_includes = false
+            add_libraries = false
+            for (line, output) {
+                line ~= s/^[ \\t]*//  # remove leading spaces
+                contains(line, "LIBRARY_PATH=.*") {
+                    line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
+                    paths = $$split(line, $$QMAKE_DIRLIST_SEP)
+                    for (path, paths): \
+                        QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path)
+                } else: contains(line, "Library search paths:") {
+                    add_libraries = true
+                } else: contains(line, "$${LITERAL_HASH}include <.*") {  # #include <...> search starts here:
+                    add_includes = true
+                } else: contains(line, "End of search.*") {
+                    add_includes = false
+                } else: $$add_libraries {
+                    # We assume all library search paths are absolute
+                    !contains(line, "^/.*") {
+                        add_libraries = false
+                        next()
+                    }
+                    QMAKE_DEFAULT_LIBDIRS += $$clean_path($$line)
+                } else: $$add_includes {
+                    !contains(line, ".* \\(framework directory\\)"): \
+                        QMAKE_DEFAULT_INCDIRS += $$clean_path($$line)
                 }
-                QMAKE_DEFAULT_LIBDIRS += $$clean_path($$line)
-            } else: $$add_includes {
-                !contains(line, ".* \\(framework directory\\)"): \
-                    QMAKE_DEFAULT_INCDIRS += $$clean_path($$line)
             }
         }
+        isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
+            !integrity: \
+                error("failed to parse default search paths from compiler output")
         QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
     } else: msvc {
         # This doesn't differentiate between host and target,
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 0a2e4122f5..f7245e48b1 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -19,7 +19,7 @@ equals(TEMPLATE, app):qt {
 load(default_post)
 
 macx-xcode {
-    ios:isEmpty(QMAKE_APPLE_TARGETED_DEVICE_FAMILY):!isEmpty(QMAKE_IOS_TARGETED_DEVICE_FAMILY) {
+    ios:!isEmpty(QMAKE_IOS_TARGETED_DEVICE_FAMILY) {
         warning("QMAKE_IOS_TARGETED_DEVICE_FAMILY is deprecated; use QMAKE_APPLE_TARGETED_DEVICE_FAMILY")
         QMAKE_APPLE_TARGETED_DEVICE_FAMILY = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY
     }
diff --git a/mkspecs/features/xctest.prf b/mkspecs/features/xctest.prf
index 4b84682df7..4ee504f0ad 100644
--- a/mkspecs/features/xctest.prf
+++ b/mkspecs/features/xctest.prf
@@ -2,5 +2,6 @@ equals(TEMPLATE, app) {
     load(sdk)
     # Make the XCTest framework available. This is normally handled automatically
     # by Xcode based on heuristics, but we need to explicitly link to XCTest.
-    QMAKE_LFLAGS += -F$${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks -weak_framework XCTest
+    !isEmpty(QMAKE_MAC_SDK_PLATFORM_PATH): \
+        QMAKE_LFLAGS += -F$${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks -weak_framework XCTest
 }