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

 Conflicts:
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/plugins/platforms/xcb/qxcbimage.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/manual/qtabletevent/regular_widgets/main.cpp

Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30

6 files changed, 23 insertions, 33 deletions

diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf
index f5eafc4e0d..1e3f9d2c1c 100644
--- a/mkspecs/features/ctest_testcase_common.prf
+++ b/mkspecs/features/ctest_testcase_common.prf
@@ -1,10 +1,5 @@
 
-win32 {
-    cmake_version_output = $$system(cmake --version 2>NUL, lines)
-} else {
-    cmake_version_output = $$system(cmake --version 2>/dev/null, lines)
-}
-
+cmake_version_output = $$system(cmake --version 2>$$QMAKE_SYSTEM_NULL_DEVICE, lines)
 # First line
 cmake_version_output = $$first(cmake_version_output)
 # Format is "cmake version X.Y.Z"
@@ -19,12 +14,7 @@ isEmpty(CMAKE_VERSION) {
     return()
 }
 
-win32 {
-    CTEST_VERSION = $$system(ctest --version 2>NUL)
-} else {
-    CTEST_VERSION = $$system(ctest --version 2>/dev/null)
-}
-
+CTEST_VERSION = $$system(ctest --version 2>$$QMAKE_SYSTEM_NULL_DEVICE)
 isEmpty(CTEST_VERSION) {
     message("ctest executable not found. Not running CMake unit tests")
     return()
diff --git a/mkspecs/features/mac/mac.prf b/mkspecs/features/mac/mac.prf
index 52f06ef773..73d8b1208b 100644
--- a/mkspecs/features/mac/mac.prf
+++ b/mkspecs/features/mac/mac.prf
@@ -13,5 +13,6 @@
     }
 
     $$add_plist: \
-        QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$QMAKE_INFO_PLIST)
+        QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote( \
+            $$relative_path($$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_), $$OUT_PWD))
 }
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 150d2b2cc3..76e1d15319 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -100,6 +100,9 @@ unix: CONFIG += explicitlib
 # By default we want tests on macOS to be built as standalone executables
 macos: CONFIG += testcase_no_bundle
 
+# Override MinGW's definition in _mingw.h
+mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601
+
 defineTest(qtBuildPart) {
     bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)
     isEmpty(bp): bp = $$QT_BUILD_PARTS
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index c00fdb73f8..1903e509c8 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -291,10 +291,7 @@ defineReplace(pkgConfigExecutable) {
         }
     }
 
-    equals(QMAKE_HOST.os, Windows): \
-        PKG_CONFIG += 2> NUL
-    else: \
-        PKG_CONFIG += 2> /dev/null
+    PKG_CONFIG += 2> $$QMAKE_SYSTEM_NULL_DEVICE
 
     return($$PKG_CONFIG)
 }
diff --git a/mkspecs/features/spec_post.prf b/mkspecs/features/spec_post.prf
index f87bf3c037..432bb51516 100644
--- a/mkspecs/features/spec_post.prf
+++ b/mkspecs/features/spec_post.prf
@@ -82,6 +82,7 @@ equals(MAKEFILE_GENERATOR, MSBUILD) \
     QMAKE_MKDIR             = mkdir          # legacy
     QMAKE_MKDIR_CMD         = if not exist %1 mkdir %1 & if not exist %1 exit 1
     QMAKE_STREAM_EDITOR     = $(QMAKE) -install sed
+    QMAKE_SHELL_NULL_DEVICE = NUL
     QMAKE_INSTALL_FILE      = copy /y
     QMAKE_INSTALL_PROGRAM   = copy /y
 } else {
@@ -101,6 +102,7 @@ equals(MAKEFILE_GENERATOR, MSBUILD) \
     QMAKE_MKDIR             = mkdir -p   # legacy
     QMAKE_MKDIR_CMD         = test -d %1 || mkdir -p %1
     QMAKE_STREAM_EDITOR     = sed
+    QMAKE_SHELL_NULL_DEVICE = /dev/null
 
     equals(QMAKE_HOST.os, Windows) {
         MINGW_IN_SHELL = 1   # legacy
@@ -118,9 +120,11 @@ equals(MAKEFILE_GENERATOR, MSBUILD) \
 }
 QMAKE_INSTALL_DIR = $$QMAKE_COPY_DIR
 equals(QMAKE_HOST.os, Windows) {
-    QMAKE_SYMBOLIC_LINK     = $(QMAKE) -install ln -f -s
-    QMAKE_LN_SHLIB          = $(QMAKE) -install ln -s
+    QMAKE_SYMBOLIC_LINK      = $(QMAKE) -install ln -f -s
+    QMAKE_LN_SHLIB           = $(QMAKE) -install ln -s
+    QMAKE_SYSTEM_NULL_DEVICE = NUL
 } else {
-    QMAKE_SYMBOLIC_LINK     = ln -f -s
-    QMAKE_LN_SHLIB          = ln -s
+    QMAKE_SYMBOLIC_LINK      = ln -f -s
+    QMAKE_LN_SHLIB           = ln -s
+    QMAKE_SYSTEM_NULL_DEVICE = /dev/null
 }
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 7b6f48de72..ba41598be1 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -32,15 +32,11 @@ isEmpty($${target_prefix}.INCDIRS) {
     # Get default include and library paths from compiler
     #
     gcc {
-        !equals(QMAKE_HOST.os, Windows) {
-            cmd_prefix = "LC_ALL=C"
-            cmd_suffix = "</dev/null >/dev/null"
-            null_file = /dev/null
-        } else {
+        cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+        equals(QMAKE_HOST.os, Windows): \
             cmd_prefix = "set LC_ALL=C&"
-            cmd_suffix = "<NUL >NUL"
-            null_file = NUL
-        }
+        else: \
+            cmd_prefix = "LC_ALL=C"
 
         cxx_flags = $$QMAKE_CXXFLAGS
 
@@ -59,7 +55,7 @@ isEmpty($${target_prefix}.INCDIRS) {
 
         rim_qcc: \
             # Need the cc1plus and ld command lines to pick up the paths
-            cxx_flags += $$QMAKE_LFLAGS_SHLIB -o $$null_file -v
+            cxx_flags += $$QMAKE_LFLAGS_SHLIB -o $$QMAKE_SYSTEM_NULL_DEVICE -v
         else: darwin:clang: \
             # Need to link to pick up library paths
             cxx_flags += $$QMAKE_LFLAGS_SHLIB -o /dev/null -v -Wl,-v
@@ -175,9 +171,8 @@ defineReplace(qtVariablesFromMSVC) {
 }
 
 defineReplace(qtVariablesFromGCC) {
-    null_device = /dev/null
-    equals(QMAKE_HOST.os, Windows): null_device = NUL
-    ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) <$$null_device 2>$$null_device", lines, ec)
+    ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) \
+        <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
     !equals(ec, 0): qtCompilerErrror($$1)
     return($$ret)
 }