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

 Conflicts:
	.qmake.conf

Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea

6 files changed, 32 insertions, 13 deletions

diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
index 9fa0c9e219..4577785576 100644
--- a/mkspecs/features/egl.prf
+++ b/mkspecs/features/egl.prf
@@ -2,6 +2,7 @@ INCLUDEPATH += $$QMAKE_INCDIR_EGL
 LIBS_PRIVATE += $$QMAKE_LIBS_EGL
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
+DEFINES += $$QMAKE_DEFINES_EGL
 LIBS += $$QMAKE_LFLAGS_EGL
 for(p, QMAKE_LIBDIR_EGL) {
     LIBS_PRIVATE += -L$$p
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 8e2c5e603a..c46222debd 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -67,7 +67,7 @@ qt {
 # Add the same default rpaths as Xcode does for new projects.
 # This is especially important for iOS/tvOS/watchOS where no other option is possible.
 !no_default_rpath {
-    QMAKE_RPATHDIR += @executable_path/Frameworks
+    QMAKE_RPATHDIR += @executable_path/../Frameworks
     equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
 }
 
diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf
index 216f37d61a..b4b1224781 100644
--- a/mkspecs/features/qmltestcase.prf
+++ b/mkspecs/features/qmltestcase.prf
@@ -1,7 +1,8 @@
 !isEmpty(SOURCES) {
     QT += qml qmltest
     load(testcase)
-    DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
+    contains(TEMPLATE, vc.*): DEFINES += QUICK_TEST_SOURCE_DIR=\"$$_PRO_FILE_PWD_\"
+    else: DEFINES += QUICK_TEST_SOURCE_DIR=$$shell_quote(\"$$_PRO_FILE_PWD_\")
 } else {
     # Allow a project to run tests without a CPP stub
     TEMPLATE = aux
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 5da82fdb5b..d8d5acaafd 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -209,14 +209,6 @@ for(ever) {
         !isEmpty(MODULE_MODULE) {
             contains(MODULE_CONFIG, lib_bundle) {
                 framework = $$MODULE_MODULE
-                qtConfig(debug_and_release):qt_link_suffixed_framework:!macx-xcode {
-                    platform_target_suffix = $$qtPlatformTargetSuffix()
-                    !isEmpty(platform_target_suffix): \
-                        # The -framework linker argument supports a name[,suffix] version,
-                        # where if the suffix is specified the framework is first searched
-                        # for the library with the suffix and then without.
-                        framework = $$framework,$$platform_target_suffix
-                }
                 LIBS$$var_sfx += -framework $$framework
             } else {
                 !isEmpty(MODULE_LIBS_ADD): \
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index bfc28c6861..b8102c26b5 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -21,15 +21,19 @@ testcase_lowdpi {
     }
 }
 
-# Make sure we explicitly link to the debug version of the Qt libraries if needed
-macos: CONFIG += qt_link_suffixed_framework
-
 benchmark: type = benchmark
 else: type = check
 
 $${type}.files =
 $${type}.path = .
 
+# Make sure we explicitly load the debug version of the Qt libraries if needed
+macos {
+    dyld_image_suffix.name = DYLD_IMAGE_SUFFIX
+    dyld_image_suffix.value = $$qtPlatformTargetSuffix()
+    QT_TOOL_ENV += dyld_image_suffix
+}
+
 # Add environment for non-installed builds. Do this first, so the
 # 'make' variable expansions don't end up in a batch file/script.
 QT_TOOL_NAME = target
diff --git a/mkspecs/win32-clang-msvc/qmake.conf b/mkspecs/win32-clang-msvc/qmake.conf
index 027f93ca6e..c639ad6f3d 100644
--- a/mkspecs/win32-clang-msvc/qmake.conf
+++ b/mkspecs/win32-clang-msvc/qmake.conf
@@ -6,6 +6,27 @@
 
 include(../common/msvc-desktop.conf)
 
+# clang-cl does not use anything above SSE2 without extra arguments
+QMAKE_CFLAGS_SSE3       = -msse3
+QMAKE_CFLAGS_SSSE3      = -mssse3
+QMAKE_CFLAGS_SSE4_1     = -msse4.1
+QMAKE_CFLAGS_SSE4_2     = -msse4.2
+QMAKE_CFLAGS_AVX        = -mavx
+QMAKE_CFLAGS_AVX2       = -mavx2
+QMAKE_CFLAGS_F16C      = -mf16c
+QMAKE_CFLAGS_RDRND     = -mrdrnd
+QMAKE_CFLAGS_AVX512F   = -mavx512f
+QMAKE_CFLAGS_AVX512ER  = -mavx512er
+QMAKE_CFLAGS_AVX512CD  = -mavx512cd
+QMAKE_CFLAGS_AVX512PF  = -mavx512pf
+QMAKE_CFLAGS_AVX512DQ  = -mavx512dq
+QMAKE_CFLAGS_AVX512BW  = -mavx512bw
+QMAKE_CFLAGS_AVX512VL  = -mavx512vl
+QMAKE_CFLAGS_AVX512IFMA = -mavx512ifma
+QMAKE_CFLAGS_AVX512VBMI = -mavx512vbmi
+QMAKE_CFLAGS_AESNI     = -maes
+QMAKE_CFLAGS_SHANI     = -msha
+
 QMAKE_COMPILER         += clang_cl llvm
 
 QMAKE_CC                = clang-cl