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

Change-Id: Ie7f68dcd5650e0037b6c3313cc9ffdcd7c494fbe

3 files changed, 37 insertions, 15 deletions

diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index bd84ce597a..dbf5b74355 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -13,7 +13,14 @@ equals(TEMPLATE, app): TEMPLATE = aux
 
 isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name)")
 
-qmldir_file = $$_PRO_FILE_PWD_/qmldir
+!isEmpty(DYNAMIC_QMLDIR) {
+    qmldir_path = $$OUT_PWD
+    write_file($${qmldir_path}/qmldir, DYNAMIC_QMLDIR)|error("Aborting.")
+} else {
+    qmldir_path = $$_PRO_FILE_PWD_
+}
+
+qmldir_file = $${qmldir_path}/qmldir
 
 fq_qml_files =
 for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
@@ -42,13 +49,20 @@ builtin_resources {
 }
 
 # Install rules
-qmldir.base = $$_PRO_FILE_PWD_
+qmldir.base = $$qmldir_path
 # Tools need qmldir and plugins.qmltypes always installed on the file system
-qmldir.files = $$qmldir_file $$fq_aux_qml_files
+
+qmldir.files = $$qmldir_file
 install_qml_files: qmldir.files += $$fq_qml_files
 qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 INSTALLS += qmldir
 
+qmlfiles.base = $$_PRO_FILE_PWD_
+qmlfiles.files = $$fq_aux_qml_files
+install_qml_files: qmlfiles.files += $$fq_qml_files
+qmlfiles.path = $${qmldir.path}
+INSTALLS += qmlfiles
+
 !debug_and_release|!build_all|CONFIG(release, debug|release) {
     !prefix_build {
         COPIES += qmldir
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 3f6914e243..a9b1eef589 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -544,7 +544,15 @@ defineTest(qtConfResolveLibs) {
         } else: contains(l, "^-l.*") {
             lib = $$replace(l, "^-l", )
             lcan =
-            unix {
+            integrity:contains(lib, "^.*\\.a") {
+                # INTEGRITY compiler searches for exact filename
+                # if -l argument has .a suffix
+                lcan += $${lib}
+            } else: contains(lib, "^:.*") {
+                # Use exact filename when -l:filename syntax is used.
+                lib ~= s/^://
+                lcan += $${lib}
+            } else: unix {
                 # Under UNIX, we look for actual shared libraries, in addition
                 # to static ones.
                 shexts = $$QMAKE_EXTENSION_SHLIB $$QMAKE_EXTENSIONS_AUX_SHLIB
diff --git a/mkspecs/win32-clang-msvc/qmake.conf b/mkspecs/win32-clang-msvc/qmake.conf
index c639ad6f3d..4b9cac3e22 100644
--- a/mkspecs/win32-clang-msvc/qmake.conf
+++ b/mkspecs/win32-clang-msvc/qmake.conf
@@ -13,19 +13,19 @@ 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_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_CFLAGS_AESNI      = -maes
+QMAKE_CFLAGS_SHANI      = -msha
 
 QMAKE_COMPILER         += clang_cl llvm