Merge remote-tracking branch 'origin/5.12' into 5.12.1

 Conflicts:
	src/widgets/kernel/qtooltip.cpp

Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8

1 files changed, 28 insertions, 18 deletions

diff --git a/src/gui/configure.pri b/src/gui/configure.pri
index e21489ec28..1b95449a10 100644
--- a/src/gui/configure.pri
+++ b/src/gui/configure.pri
@@ -15,30 +15,40 @@ defineTest(qtConfLibrary_freetype) {
     return(true)
 }
 
-# Check for Direct X SDK (include, lib, and direct shader compiler 'fxc').
+# Check for Direct X shader compiler 'fxc'.
 # Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the
 # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in
-# the Windows SDK. Checking for the header is not sufficient, since it
-# is also present in MinGW.
-defineTest(qtConfTest_directX) {
-    dxdir = $$getenv("DXSDK_DIR")
-    !isEmpty(dxdir) {
-        EXTRA_INCLUDEPATH += $$dxdir/include
-        equals(QT_ARCH, x86_64): \
-            EXTRA_LIBDIR += $$dxdir/lib/x64
+# the Windows SDK.
+defineTest(qtConfTest_fxc) {
+    !mingw {
+        fxc = $$qtConfFindInPath("fxc.exe")
+    } else {
+        equals(QMAKE_HOST.arch, x86_64): \
+            fns = x64/fxc.exe
         else: \
-            EXTRA_LIBDIR += $$dxdir/lib/x86
-        EXTRA_PATH += $$dxdir/Utilities/bin/x86
+            fns = x86/fxc.exe
+        dxdir = $$(DXSDK_DIR)
+        !isEmpty(dxdir) {
+            fxc = $$dxdir/Utilities/bin/$$fns
+        } else {
+            winkitbindir = $$(WindowsSdkVerBinPath)
+            !isEmpty(winkitbindir) {
+                fxc = $$winkitbindir/$$fns
+            } else {
+                winkitdir = $$(WindowsSdkDir)
+                !isEmpty(winkitdir): \
+                    fxc = $$winkitdir/bin/$$fns
+            }
+        }
     }
 
-    $$qtConfEvaluate("features.sse2") {
-        ky = $$size($${1}.files._KEYS_)
-        $${1}.files._KEYS_ += $$ky
-        # Not present on MinGW-32
-        $${1}.files.$${ky} = "intrin.h"
+    !isEmpty(fxc):exists($$fxc) {
+        $${1}.value = $$clean_path($$fxc)
+        export($${1}.value)
+        $${1}.cache += value
+        export($${1}.cache)
+        return(true)
     }
-
-    qtConfTest_files($${1}): return(true)
     return(false)
 }