From 826b09f0c507fe5321a8534054a4f0b7bdd2699b Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Date: Tue, 4 Dec 2018 12:00:37 +0100
Subject: Fix build of static plugins with resources

This patch reverts 388c4ef9f78c8e. The reason is that it generates a symbol
(resource_init_function) based on the name of the pro-file. But if different
plugins are built from a pro-file with the same name, you end up linking in
many symbols with the same name as well. Which one that ends up being used at
runtime will typically depend on the linking order of the plugins.

This problem will happen if you build an app for iOS that uses both controls 1
and controls 2. In that case, both QML plugins are built from a "controls.pro"
file. At runtime, only one of the plugins will be imported correctly.

This patch therefore reverts 388c4ef9f78c8e, but at the same time, to not
re-introduce the problem it fixed, we instead genereate both a debug and release
version of the plugin_resources.cpp file. That way we can still depend on the
TARGET variable for generating both the resource_init_function symbol and the
cpp file.

Fixes: QTBUG-62647
Fixes: QTBUG-71386
Fixes: QTBUG-72108
Change-Id: I3d8c53132458b30ed9f47a259f1f8e4fa4d44130
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/features/resources.prf | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index a25846bd77..48e9f83885 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -73,17 +73,14 @@ for(resource, RESOURCES) {
 }
 
 !isEmpty(RESOURCES):contains(TEMPLATE, .*lib):plugin:static {
-    pluginName = $$lower($$replace(_PRO_FILE_, .*/([^/.]+)\\.[^/.]+, \\1))
-
-    resource_init_function = $${pluginName}_plugin_resource_init
+    resource_init_function = $$lower($$basename(TARGET))_plugin_resource_init
     DEFINES += "QT_PLUGIN_RESOURCE_INIT_FUNCTION=$$resource_init_function"
-
-    RESOURCE_INIT_CPP = $$OUT_PWD/$${pluginName}_plugin_resources.cpp
+    RESOURCE_INIT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_plugin_resources.cpp
 
     GENERATED_SOURCES += $$RESOURCE_INIT_CPP
     QMAKE_DISTCLEAN += $$RESOURCE_INIT_CPP
 
-    !build_pass {
+    isEmpty(BUILDS)|build_pass {
         RESOURCE_INIT_CONT = \
             "// This file is autogenerated by qmake. It contains a function that" \
             "// references all resources the plugin includes and the function is" \
-- 
cgit v1.2.3


From 76f11b0eda50f05fb0912738be41b4333a82f748 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Mon, 10 Dec 2018 16:21:07 +0200
Subject: Silence GCC 9 warnings

Change-Id: I5654881a3adac6f67a38837321c8e1c3ce1e2d8f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 mkspecs/features/qt_common.prf         | 17 ++++++++++++++++-
 mkspecs/features/qt_module_headers.prf |  8 ++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 4ad9946ae0..e67b79acc3 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -89,6 +89,14 @@ clang {
     greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond
     # GCC 7 has a lot of false positives relating to this, so disable completely
     greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow
+    # GCC 9 has a lot of false positives relating to this, so disable completely
+    greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy
+    # GCC 9 introduced this
+    greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move
+    # GCC 9 introduced this
+    greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow
+    # GCC 9 introduced this
+    greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime
 }
 
 warnings_are_errors:warning_clean {
@@ -127,7 +135,14 @@ warnings_are_errors:warning_clean {
 
             # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs.
             greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough
-
+            # GCC 9 has a lot of false positives relating to this, so disable completely
+            greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy
+            # GCC 9 introduced this
+            greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move
+            # GCC 9 introduced this
+            greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow
+            # GCC 9 introduced this
+            greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime
             # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
             android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
         }
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 70d3520e5c..6b4b9143fa 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -239,6 +239,14 @@ headersclean:!internal_module {
                 gcc_ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION}
                 versionAtLeast(gcc_ver, 4.5): hcleanFLAGS += -Wdouble-promotion
                 versionAtLeast(gcc_ver, 4.9): hcleanFLAGS += -Wfloat-conversion
+                # GCC 9 has a lot of false positives relating to this, so disable completely
+                greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-deprecated-copy
+                # GCC 9 introduced this
+                greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-redundant-move
+                # GCC 9 introduced this
+                greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-format-overflow
+                # GCC 9 introduced this
+                greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-init-list-lifetime
 
                 c++11 {
                     # only enabled for actual c++11 builds due to
-- 
cgit v1.2.3


From bccb964b9a201a87080d524a0d3c11551f794901 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 19 Oct 2018 19:01:37 +0200
Subject: escape literal backslashes in qmake files

Task-number: QTBUG-70765
Change-Id: I56abbf19be88d01b2964980fb741567f28e4f0fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/mac/asset_catalogs.prf |  2 +-
 mkspecs/features/mac/default_post.prf   |  2 +-
 mkspecs/features/moc.prf                |  2 +-
 mkspecs/features/qt_configure.prf       | 38 ++++++++++++++++-----------------
 mkspecs/features/qt_docs.prf            |  2 +-
 mkspecs/features/static_runtime.prf     |  4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/mac/asset_catalogs.prf b/mkspecs/features/mac/asset_catalogs.prf
index 123a0e0fcd..58211c13a2 100644
--- a/mkspecs/features/mac/asset_catalogs.prf
+++ b/mkspecs/features/mac/asset_catalogs.prf
@@ -110,7 +110,7 @@
     # Backwards compatibility
     for (bundle_data, QMAKE_BUNDLE_DATA) {
         for (bundle_file, $${bundle_data}.files) {
-            !contains(bundle_file, .*\.xcassets$): next()
+            !contains(bundle_file, .*\\.xcassets$): next()
             warning("*.xcassets in QMAKE_BUNDLE_DATA is deprecated. Use QMAKE_ASSET_CATALOGS instead.")
             !exists($$absolute_path($$bundle_file/AppIcon.appiconset, $$_PRO_FILE_PWD_)): next()
 
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index c01e99fe8e..3881b432ef 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -21,7 +21,7 @@ contains(TEMPLATE, .*app) {
         !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \
             CONFIG += sdk_no_version_check
 
-        QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\d+)(\.\d+)(\.\d+)?", \1\2)
+        QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1\\2)
 
         !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_MINOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) {
             warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 5c7745e5bb..d075183028 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -38,7 +38,7 @@ if(gcc|intel_icl|msvc):!rim_qcc:!uikit:!no_moc_predefs:if(!macos|count(QMAKE_APP
     } else:         error("Oops, I messed up")
     moc_predefs.output = $$MOC_DIR/moc_predefs.h
     moc_predefs.input = MOC_PREDEF_FILE
-    silent: moc_predefs.commands = @echo generating $$moc_predefs.output$$escape_expand(\n\t)@$$moc_predefs.commands
+    silent: moc_predefs.commands = @echo generating $$moc_predefs.output$$escape_expand(\\n\\t)@$$moc_predefs.commands
     QMAKE_EXTRA_COMPILERS += moc_predefs
     MOC_PREDEF_FILE = $$[QT_HOST_DATA/src]/mkspecs/features/data/dummy.cpp
 }
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index d8f5af5404..d071e51769 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1196,9 +1196,9 @@ defineTest(qtConfTest_files) {
     for(i, $${1}.files._KEYS_) {
         f = $$eval($${1}.files.$${i})
         qtLog("Searching for file $${f}.")
-        contains(f, ".*\.h") {
+        contains(f, ".*\\.h") {
             file = $$qtConfFindInPathList($$f, $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS)
-        } else: contains(f, ".*\.(lib|so|a)") {
+        } else: contains(f, ".*\\.(lib|so|a)") {
             file = $$qtConfFindInPathList($$f, $$EXTRA_LIBDIR $$QMAKE_DEFAULT_LIBDIRS)
         } else {
             # assume we're looking for an executable
@@ -1399,7 +1399,7 @@ defineReplace(qtConfEvaluate) {
     1 ~= s/$$escape_expand(\\n) */ /g
     expr = $${1}
     expr ~= s/&&/ && /g
-    expr ~= s/\|\|/ || /g
+    expr ~= s/\\|\\|/ || /g
     expr ~= s/!/ ! /g
     expr ~= s/\\(/ ( /g
     expr ~= s/\\)/ ) /g
@@ -1422,7 +1422,7 @@ defineReplace(qtConfEvaluateSingleExpression) {
     } else: contains(e, "^'.*'$") {
         # quoted literals
         result = $$replace(e, "^'(.*)'$", "\\1")
-    } else: contains(e, "^tests\..*") {
+    } else: contains(e, "^tests\\..*") {
         !qt_conf_tests_allowed: \
             error("Expression '$${1}' refers to a test, which is not allowed at this stage of configuring.")
         test = $$section(e, ".", 1, 1)
@@ -1433,7 +1433,7 @@ defineReplace(qtConfEvaluateSingleExpression) {
             error("Unknown test object $${test} in expression '$${1}'.")
         qtRunSingleTest($$test)
         result = $$eval($${currentConfig}.tests.$${test}.$${var})
-    } else: contains(e, "^libs\..*") {
+    } else: contains(e, "^libs\\..*") {
         !qt_conf_tests_allowed: \
             error("Expression '$${1}' refers to a library, which is not allowed at this stage of configuring.")
         lib = $$section(e, ".", 1, 1)
@@ -1446,7 +1446,7 @@ defineReplace(qtConfEvaluateSingleExpression) {
         !defined($${currentConfig}.libraries.$${lib}.$${var}, var): \
             var = sources.$$eval($${currentConfig}.libraries.$${lib}.source).$$var
         result = $$eval($${currentConfig}.libraries.$${lib}.$${var})
-    } else: contains(e, "^features\..*") {
+    } else: contains(e, "^features\\..*") {
         feature = $$section(e, ".", 1, 1)
         var = $$section(e, ".", 2, -1)
         isEmpty(var): \
@@ -1470,33 +1470,33 @@ defineReplace(qtConfEvaluateSingleExpression) {
         !qtConfCheckFeature($$feature): \
             error("Expression '$$1' is accessing non-emitted feature $${feature}.")
         result = $$eval($${currentConfig}.features.$${feature}.$${var})
-    } else: contains(e, "^config\..*") {
-        var = $$replace(e, "^config\.", "")
+    } else: contains(e, "^config\\..*") {
+        var = $$replace(e, "^config\\.", "")
         result = false
         contains(CONFIG, $$var): result = true
-    } else: contains(e, "^module\..*") {
-        var = $$replace(e, "^module\.", "")
+    } else: contains(e, "^module\\..*") {
+        var = $$replace(e, "^module\\.", "")
         result = false
         qtConfHaveModule($$var): result = true
-    } else: contains(e, "^arch\..*") {
-        var = $$replace(e, "^arch\.", "")
+    } else: contains(e, "^arch\\..*") {
+        var = $$replace(e, "^arch\\.", "")
         result = false
         isEmpty(QT_ARCH): \
             qtConfCheckFeature(architecture)
         contains(QT_ARCH, $$var): result = true
-    } else: contains(e, "^subarch\..*") {
-        var = $$replace(e, "^subarch\.", "")
+    } else: contains(e, "^subarch\\..*") {
+        var = $$replace(e, "^subarch\\.", "")
         result = false
         isEmpty(QT_ARCH): \
             qtConfCheckFeature(architecture)
         contains(QT_CPU_FEATURES.$$QT_ARCH, $$var): result = true
-    } else: contains(e, "^input\..*") {
+    } else: contains(e, "^input\\..*") {
         result = $$eval(config.$$e)
-    } else: contains(e, "^var\..*") {
-        var = $$replace(e, "^var\.", "")
+    } else: contains(e, "^var\\..*") {
+        var = $$replace(e, "^var\\.", "")
         result = $$eval($$var)
-    } else: contains(e, "^call\..*") {
-        call = $$replace(e, "^call\.", "qtConfFunc_")
+    } else: contains(e, "^call\\..*") {
+        call = $$replace(e, "^call\\.", "qtConfFunc_")
         !defined($$call, replace): \
             error("Call $$call referenced in expression '$${1}' does not exist")
         eval(result = \$\$"$$call"())
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 3139c443c6..3b74cd4dd5 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -18,7 +18,7 @@ isEmpty(qtver.value): error("No version for documentation specified.")
 qtmver.name = QT_VER
 qtmver.value = $$replace(qtver.value, ^(\\d+\\.\\d+).*$, \\1)
 qtvertag.name = QT_VERSION_TAG
-qtvertag.value = $$replace(qtver.value, \.,)
+qtvertag.value = $$replace(qtver.value, \\.,)
 qtdocs.name = QT_INSTALL_DOCS
 qtdocs.value = $$[QT_INSTALL_DOCS/src]
 builddir.name = BUILDDIR
diff --git a/mkspecs/features/static_runtime.prf b/mkspecs/features/static_runtime.prf
index 1af3236189..e20bfc4281 100644
--- a/mkspecs/features/static_runtime.prf
+++ b/mkspecs/features/static_runtime.prf
@@ -1,7 +1,7 @@
 msvc {
     # -MD becomes -MT, -MDd becomes -MTd
-    QMAKE_CFLAGS ~= s,^-MD(d?)$,-MT\1,g
-    QMAKE_CXXFLAGS ~= s,^-MD(d?)$,-MT\1,g
+    QMAKE_CFLAGS ~= s,^-MD(d?)$,-MT\\1,g
+    QMAKE_CXXFLAGS ~= s,^-MD(d?)$,-MT\\1,g
 } else: mingw {
     QMAKE_LFLAGS += -static
 }
-- 
cgit v1.2.3


From 69f6d3bd44e4e2d36ef741a1914227f804504141 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 27 Nov 2018 13:53:44 +0100
Subject: configure: fix $$qtConfFindInPath() on windows

uses of this function (or the "files" stanza in configure.json) which
don't explicitly target windows don't specify the .exe extension, so we
need to add it automatically if it's missing.

Task-number: QTBUG-57436
Change-Id: I1994378399bc3466c32ee065e752516f42652975
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index d071e51769..e2e341770e 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -378,6 +378,7 @@ defineReplace(qtConfFindInPathList) {
 
 defineReplace(qtConfFindInPath) {
     ensurePathEnv()
+    equals(QMAKE_HOST.os, Windows):!contains(1, .*\\.exe): 1 = $${1}.exe
     return($$qtConfFindInPathList($$1, $$2 $$QMAKE_PATH_ENV))
 }
 
-- 
cgit v1.2.3


From 74cdd89e0fd437ef4c4041f04c9aa522f2371615 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 13 Dec 2018 16:20:40 +0100
Subject: qmake: don't assign fallbacks for QMAKE_DEFAULT_{INC,LIB}DIRS in
 x-builds

these cannot be possibly correct, and might mislead.

Change-Id: Ie10531807978def04768e2429304949415cafb2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 55295f271f..e8c3f81c8b 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -178,7 +178,7 @@ isEmpty($${target_prefix}.INCDIRS) {
         QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
     }
 
-    unix {
+    unix:if(!cross_compile|host_build) {
         isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
     }
-- 
cgit v1.2.3


From 852b1afa5658d410a270a09ee7b94572df52ccbe Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 13 Dec 2018 17:53:38 +0100
Subject: qmake: don't misuse cache()

... when QMAKE_DEFAULT_{INC,LIB}DIRS cannot be determined.

it would have been nicer to actually persist empty results, but cache()
won't do that, and fixing it doesn't seem worth the effort now.

Change-Id: I95d5645e40a0da572f0def16462703373eaeb804
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index e8c3f81c8b..63f2f12e21 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -183,8 +183,11 @@ isEmpty($${target_prefix}.INCDIRS) {
         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
     }
 
-    cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
-    cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
+    # cache() complains about undefined variables and doesn't persist empty ones.
+    !isEmpty(QMAKE_DEFAULT_INCDIRS): \
+        cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
+    !isEmpty(QMAKE_DEFAULT_LIBDIRS): \
+        cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
 } else {
     QMAKE_DEFAULT_INCDIRS = $$eval($${target_prefix}.INCDIRS)
     QMAKE_DEFAULT_LIBDIRS = $$eval($${target_prefix}.LIBDIRS)
-- 
cgit v1.2.3


From a8cb177d31d45a8cfee16b2c82131d1474d1d2e5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 11 Dec 2018 15:02:16 +0100
Subject: Fix build with win32-clang-msvc and win32-icc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fbbe8aba9d70a3c13d1cd7797eb4dbbd1f05ade5 introduced a check for
MSVC_VER to qmake, which is not set in win32-clang-msvc,
causing the build to fail:

Mkspec does not specify MSVC_VER. Cannot continue.
Unable to generate output for: .../config.tests/verifyspec/Makefile

Extract a minimal msvc-based-version.conf which determines
MSVC_VER from QMAKE_MSC_VER for win32-clang-msvc and win32-icc.

Task-number: QTBUG-63512
Change-Id: Ia6de8c4b1aae2ae1962cf4e60e3e6d51fdbbbabe
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/common/msvc-based-version.conf | 32 ++++++++++++++++++++++++++++++++
 mkspecs/common/msvc-version.conf       | 10 +++-------
 mkspecs/features/toolchain.prf         |  6 +++++-
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 mkspecs/common/msvc-based-version.conf

(limited to 'mkspecs')

diff --git a/mkspecs/common/msvc-based-version.conf b/mkspecs/common/msvc-based-version.conf
new file mode 100644
index 0000000000..38aecbaf59
--- /dev/null
+++ b/mkspecs/common/msvc-based-version.conf
@@ -0,0 +1,32 @@
+#
+# qmake configuration for Compilers based on the Microsoft Visual Studio
+# C/C++ Compilers like win32-clang-msvc
+
+#
+# Version-specific changes
+#
+
+isEmpty(QMAKE_MSC_VER): error("msvc-based-version.conf loaded but QMAKE_MSC_VER isn't set")
+
+MSVC_VER = 14.0
+COMPAT_MKSPEC       = win32-msvc2015
+
+# -utf-8 compiler option for Visual Studio 2015 Update 2
+greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
+    isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
+        QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
+    }
+}
+
+greaterThan(QMAKE_MSC_VER, 1909) {
+    # Visual Studio 2017 (15.0) / Visual C++ 19.10 and up
+    MSVC_VER            = 15.0
+    COMPAT_MKSPEC       = win32-msvc2017
+}
+
+greaterThan(QMAKE_MSC_VER, 1910) {
+    # No compat spec past MSVC 2017
+    COMPAT_MKSPEC       =
+}
+
+!isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index 3fb55c9d81..de8ba56b7b 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -1,7 +1,6 @@
 #
 # qmake configuration for Microsoft Visual Studio C/C++ Compiler
-# This file is used by win32-msvc, win32-clang-msvc, and all
-# winrt-XXX-msvcXXX specs
+# This file is used by win32-msvc and all winrt-XXX-msvcXXX specs
 #
 
 #
@@ -70,11 +69,8 @@ greaterThan(QMAKE_MSC_VER, 1899) {
     QMAKE_CXXFLAGS     += -Zc:strictStrings -Zc:throwingNew
     QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 -wd4467
 
-    greaterThan(QMAKE_MSC_FULL_VER, 190023918):!intel_icl {
-        isEmpty(QT_CLANG_MAJOR_VERSION)|!lessThan(QT_CLANG_MAJOR_VERSION, 4) {
-            QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
-        }
-    }
+    # -utf-8 compiler option for Visual Studio 2015 Update 2
+    greaterThan(QMAKE_MSC_FULL_VER, 190023918): QMAKE_CFLAGS_UTF8_SOURCE = -utf-8
 }
 
 greaterThan(QMAKE_MSC_VER, 1909) {
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 63f2f12e21..c7ea20e180 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -281,4 +281,8 @@ QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
 
-msvc:!intel_icl:!clang_cl: include(../common/msvc-version.conf)
+clang_cl|intel_icl {
+    include(../common/msvc-based-version.conf)
+} else: msvc {
+    include(../common/msvc-version.conf)
+}
-- 
cgit v1.2.3


From e9c08f8287556742fbb927653b4c2d071923e5a7 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 22 May 2018 21:17:11 -0300
Subject: Mark ICC 18 & 19 as warning-free
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I052407b777ec43f78378fffd15311de83f978817
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
---
 mkspecs/features/qt_common.prf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index e67b79acc3..6cb2e78c1c 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -112,16 +112,17 @@ warnings_are_errors:warning_clean {
             QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR
         }
     } else:intel_icc:linux {
-        # Intel CC 13.0 - 17.0, on Linux only
+        # Intel CC 13.0 - 18.0, on Linux only
         ver = $${QT_ICC_MAJOR_VERSION}.$${QT_ICC_MINOR_VERSION}
-        linux:contains(ver, "(1[3456]\\.|17\\.0)") {
+        linux:contains(ver, "(1[345678]\\.|19\\.0)") {
             # 177: function "entity" was declared but never referenced
             #      (too aggressive; ICC reports even for functions created due to template instantiation)
             # 1224: #warning directive
             # 1478: function "entity" (declared at line N) was declared deprecated
+            # 1786: function "entity" (declared at line N of "file") was declared deprecated ("message")
             # 1881: argument must be a constant null pointer value
             #      (NULL in C++ is usually a literal 0)
-            QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1881 $$WERROR
+            QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1786,1881 $$WERROR
         }
     } else:gcc:!clang:!intel_icc:!rim_qcc {
         # GCC 4.6-4.9, 5.x, ...
-- 
cgit v1.2.3


From e80bf655e922e9864f8843b5e7bbb47019a6d95a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 7 Dec 2017 19:30:07 +0100
Subject: configure: verify header presence against sources

in addition to the actual library resolution, also resolve the headers
belonging to the library, to validate the include path, and possibly
ensure that the right version of the library is present.

the "include" entries were moved out of the "test" objects, and renamed
to "headers". this cleanly permits libraries without compile tests.

the headers were not put into the sources, because the variance among
the includes is generally orthogonal to the variance among the
libraries.

note that this - like the library resolution - provides no support for
darwin frameworks. consequently, the opengl libraries are excluded from
the conversion on darwin.

similarly, wasm is excluded (centrally), because emcc is magic and would
need advanced wizardry to be dealt with.

Change-Id: Ib390c75371efa2badcfec9b74274047ce67c3e5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 mkspecs/features/qt_configure.prf | 58 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 7 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index e2e341770e..3483ddc5dc 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -582,7 +582,33 @@ defineTest(qtConfResolvePathLibs) {
     return($$ret)
 }
 
-# includes-var, includes
+defineReplace(qtConfGetTestIncludes) {
+    defined($${1}._KEYS_, var) {
+        1st = $$first($${1}._KEYS_)
+        equals(1st, 0) {
+            # array; recurse for every element
+            ret =
+            for (k, $${1}._KEYS_): \
+                ret += $$qtConfGetTestIncludes($${1}.$$k)
+            return($$ret)
+        }
+        # object; try condition and recurse
+        !defined($${1}.headers, var):!defined($${1}.headers._KEYS_, var): \  # just plain broken without it
+            error("headers object '$$1' has no nested headers entry")
+        cond = $$eval($${1}.condition)
+        isEmpty(cond): \  # would be pointless otherwise
+            error("headers object '$$1' has no condition")
+        !$$qtConfEvaluate($$cond) {
+            qtLog("header entry '$$1' failed condition '$$cond'.")
+            return()
+        }
+        qtLog("header entry '$$1' passed condition.")
+        return($$qtConfGetTestIncludes($${1}.headers))
+    }
+    return($$eval($$1))  # plain string - or nothing (can happen for top-level call only)
+}
+
+# includes-var, in-paths, test-object-var
 defineTest(qtConfResolvePathIncs) {
     ret = true
     for (incdir, 2) {
@@ -594,6 +620,21 @@ defineTest(qtConfResolvePathIncs) {
     2 -= $$QMAKE_DEFAULT_INCDIRS
     $$1 = $$2
     export($$1)
+    wasm {
+        # FIXME: emcc downloads pre-built libraries and adds their include
+        # path to the clang call dynamically. it would be possible to parse
+        # the emcc -s USE_xyz=1 --cflags output to populate xzy_INCDIR and
+        # thus make the code below work.
+        return($$ret)
+    }
+    hdrs = $$qtConfGetTestIncludes($${3}.headers)
+    for (hdr, hdrs) {
+        h = $$qtConfFindInPathList($$hdr, $$2 $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS)
+        isEmpty(h) {
+            qtLog("$$hdr not found in [$$val_escape(2)] and global paths.")
+            ret = false
+        }
+    }
     return($$ret)
 }
 
@@ -662,7 +703,7 @@ defineTest(qtConfLibrary_inline) {
     !qtConfResolveAllLibs($$1): \
         return(false)
 
-    !qtConfResolvePathIncs($${1}.includedir, $$includes): \
+    !qtConfResolvePathIncs($${1}.includedir, $$includes, $$2): \
         return(false)
 
     return(true)
@@ -678,7 +719,7 @@ defineTest(qtConfLibrary_makeSpec) {
     !qtConfResolvePathLibs($${1}.libs, $$eval(QMAKE_LIBDIR_$$spec), $$eval(QMAKE_LIBS_$$spec)): \
         return(false)
 
-    !qtConfResolvePathIncs($${1}.includedir, $$eval(QMAKE_INCDIR_$$spec)): \
+    !qtConfResolvePathIncs($${1}.includedir, $$eval(QMAKE_INCDIR_$$spec), $$2): \
         return(false)
 
     # note that the object is re-exported, because we resolve the libraries.
@@ -741,7 +782,7 @@ defineTest(qtConfLibrary_pkgConfig) {
     }
     !isEmpty(ignored): \
         qtLog("Note: Dropped compiler flags '$$ignored'.")
-    !qtConfResolvePathIncs($${1}.includedir, $$includes): \
+    !qtConfResolvePathIncs($${1}.includedir, $$includes, $$2): \
         return(false)
     $${1}.defines = $$defines
 
@@ -1054,7 +1095,7 @@ defineTest(qtConfTestPrepare_compile) {
 }
 
 defineTest(qtConfPrepareCompileTestSource) {
-    test_dir = $$2
+    test_dir = $$3
 
     test_lang = $$eval($${1}.lang)
     isEmpty(test_lang): test_lang = "c++"
@@ -1071,7 +1112,10 @@ defineTest(qtConfPrepareCompileTestSource) {
     for (ent, $$qtConfScalarOrList($${1}.head)): \
         contents += $$ent
     # Includes
-    for (ent, $$qtConfScalarOrList($${1}.include)): \
+    hdrs = $$qtConfGetTestIncludes($${1}.include)
+    isEmpty(hdrs): \
+        hdrs = $$qtConfGetTestIncludes($$2)
+    for (ent, hdrs): \
         contents += "$${LITERAL_HASH}include <$$ent>"
     # Custom code after includes
     for (ent, $$qtConfScalarOrList($${1}.tail)): \
@@ -1107,7 +1151,7 @@ defineTest(qtConfTest_compile) {
     isEmpty(test) {
         test_dir = $$test_base_out_dir/$$section(1, ".", -1)
         test_out_dir = $$test_dir
-        qtConfPrepareCompileTestSource($${1}.test, $$test_dir)
+        qtConfPrepareCompileTestSource($${1}.test, $${1}.headers, $$test_dir)
     } else {
         test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
         test_out_dir = $$test_base_out_dir/$$test
-- 
cgit v1.2.3


From b34143f8a19040a457d399a22f0bde53ac327ff1 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Tue, 11 Dec 2018 00:52:36 +0800
Subject: Fix clang LTCG config on Windows

To enable LTCG, clang-cl.exe need "-flto" instead of "-GL". But if you
enabled LTO, the lib tool will have to change to "llvm-lib.exe" and the
link tool also need to change to "lld-link.exe", because msvc linker
will see these lib files as corrupted files. Leave QMAKE_LFLAGS_LTCG
empty because lld-link doesn't need any additional parameters.

Fixes: QTBUG-72402
Change-Id: Ia34d98bd1ad919d542ea3eac83944bf8c40ce0cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/win32-clang-msvc/qmake.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/win32-clang-msvc/qmake.conf b/mkspecs/win32-clang-msvc/qmake.conf
index ba9704e069..027f93ca6e 100644
--- a/mkspecs/win32-clang-msvc/qmake.conf
+++ b/mkspecs/win32-clang-msvc/qmake.conf
@@ -15,6 +15,14 @@ QMAKE_CFLAGS           += -Wno-microsoft-enum-value
 
 QMAKE_CXXFLAGS         += -Wno-microsoft-enum-value
 
+QMAKE_LINK              = lld-link
+QMAKE_LIB               = llvm-lib /NOLOGO
+
+QMAKE_CFLAGS_LTCG       = -flto
+QMAKE_CXXFLAGS_LTCG     = $$QMAKE_CFLAGS_LTCG
+# Leave QMAKE_LFLAGS_LTCG empty because lld-link doesn't need any additional parameters
+QMAKE_LFLAGS_LTCG       =
+
 # Precompiled headers are not supported yet by clang
 CONFIG -= precompile_header
 
-- 
cgit v1.2.3


From bd05a009f0f9119dccf912550a6b44f825a9400b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 14 Dec 2018 16:11:01 +0100
Subject: configure: add "we mean it" blurb

like all qt_*.prf files (exceptions prove the rule), the configure
system counts as private api.

Change-Id: Iea3057445e430029ecd8449e604e2d5c499ae10a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 mkspecs/features/qt_configure.prf | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 3483ddc5dc..c854a31f55 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1,3 +1,13 @@
+#
+#  W A R N I N G
+#  -------------
+#
+# This file is not part of the Qt API.  It exists purely as an
+# implementation detail.  It may change from version to version
+# without notice, or even be removed.
+#
+# We mean it.
+#
 
 QT_CONFIGURE_REPORT =
 QT_CONFIGURE_NOTES =
-- 
cgit v1.2.3


From cf51bcba10af20b6c603c34f0be99b7c34f6a8f7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 3 May 2018 17:37:10 +0200
Subject: configure: allow libraries to create explicitly empty tests

this allows compile-testing the specified headers with no further tests.

Change-Id: I268ff328deee221d9b92386fe2bd133b19a6f8e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/features/qt_configure.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index c854a31f55..fe14ea1f40 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -982,7 +982,7 @@ defineTest(qtConfHandleLibrary) {
         export($${lpfx}.source)
 
         # if the library defines a test, use it to verify the source.
-        !isEmpty($${lpfx}.test)|!isEmpty($${lpfx}.test._KEYS_) {
+        defined($${lpfx}.test, var)|defined($${lpfx}.test._KEYS_, var) {
             $${lpfx}.resolved_uses = $$currentConfig:$$1
             $${lpfx}.host = $$eval($${spfx}.host)
             !qtConfTest_compile($$lpfx) {
-- 
cgit v1.2.3


From 32aa6734d445e1eed38e55ee03af4267ab6cd2c7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 14 Dec 2018 17:49:43 +0100
Subject: configure: add support for multiple libdirs in inline library sources

while the command line doesn't actually permit it (that can be
re-evaluated separately), derivatives of the inline source type may want
to inject additional paths, as is the case with opcua.

the incdir field supports multiple entries without additional action.

Change-Id: I3860ca1fc8fab25c04eb63bdb2f855b77ff3b9a4
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index fe14ea1f40..5798a8a27b 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -707,8 +707,12 @@ defineTest(qtConfLibrary_inline) {
     }
 
     libdir = $$eval(config.input.$${input}.libdir)
-    !isEmpty(libdir): \
-        $${1}.libs = -L$$libdir $$eval($${1}.libs)
+    !isEmpty(libdir) {
+        libs =
+        for (ld, libdir): \
+            libs += -L$$ld
+        $${1}.libs = $$libs $$eval($${1}.libs)
+    }
 
     !qtConfResolveAllLibs($$1): \
         return(false)
-- 
cgit v1.2.3


From a8207699ce282cdcaa9423374fdad20a63897d25 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 24 Nov 2017 19:48:33 +0100
Subject: configure: normalize dashes to underscores in exported libraries

it works without it, but technically speaking it's undefined behavior.

Change-Id: Icdcdd5b923ce4cecd9dc9e75f9d5d66d0fa8a032
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qmake_use.prf     |  6 +++---
 mkspecs/features/qt_configure.prf  | 16 ++++++++--------
 mkspecs/features/qt_helper_lib.prf |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf
index 8159e471a2..64faa4f215 100644
--- a/mkspecs/features/qmake_use.prf
+++ b/mkspecs/features/qmake_use.prf
@@ -5,14 +5,14 @@ for(ever) {
     for (use, QMAKE_USE$${suffix}) {
         use = $$split(use, /)
         name = $$take_first(use)
-        nu = $$upper($$name)
+        nu = $$upper($$replace(name, -, _))
         !contains(use, linkonly): CC_USES += $$nu
         !contains(use, nolink): LD_USES += $$nu
     }
     CC_USES = $$resolve_depends(CC_USES, QMAKE_DEPENDS_, _CC)
     for (nu, CC_USES) {
         !defined(QMAKE_LIBS_$$nu, var): \
-            error("Library '$$lower($$nu)' is not defined.")
+            error("Library '$$lower($$replace(nu, _, -))' is not defined.")
 
         DEFINES += $$eval(QMAKE_DEFINES_$${nu})
         INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu})
@@ -20,7 +20,7 @@ for(ever) {
     LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
     for (nu, LD_USES) {
         !defined(QMAKE_LIBS_$$nu, var): \
-            error("Library '$$lower($$nu)' is not defined.")
+            error("Library '$$lower($$replace(nu, _, -))' is not defined.")
 
         debug: \
             LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_DEBUG) $$eval(QMAKE_LIBS_$$nu)
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 5798a8a27b..83802cffca 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -439,12 +439,12 @@ defineTest(qtConfSetupLibraries) {
         lpfx = $${currentConfig}.libraries.$${l}
         # 'export' may be omitted, in which case it falls back to the library's name
         !defined($${lpfx}.export, var) {
-            $${lpfx}.export = $$l
+            $${lpfx}.export = $$replace(l, -, _)
             export($${lpfx}.export)
         }
         # 'export' may also be empty, but we need a derived identifier
         alias = $$eval($${lpfx}.export)
-        isEmpty(alias): alias = $$l
+        isEmpty(alias): alias = $$replace(l, -, _)
         $${lpfx}.alias = $$alias
         export($${lpfx}.alias)
         # make it easy to refer to the library by its export name.
@@ -804,7 +804,7 @@ defineTest(qtConfLibrary_pkgConfig) {
     largs = $$qtConfAllLibraryArgs($$eval($${2}.dependencies))
     for (la, largs): \
         eval("$$la")
-    USES = $$eval($$list($$upper($$QMAKE_USE)))
+    USES = $$eval($$list($$upper($$replace(QMAKE_USE, -, _))))
     # _CC == _LD for configure's library sources, so pick first arbitrarily.
     DEPS = $$resolve_depends(USES, QMAKE_DEPENDS_, _CC)
     for (DEP, DEPS) {
@@ -837,7 +837,7 @@ defineTest(qtConfTest_getPkgConfigVariable) {
 }
 
 defineReplace(qtConfLibraryArgs) {
-    NAME = $$upper($$eval($${1}.library))
+    NAME = $$upper($$replace($${1}.library, -, _))
     qmake_args = "QMAKE_LIBS_$${NAME} = $$val_escape($${1}.libs)"
     for (b, $${1}.builds._KEYS_): \
         qmake_args += "QMAKE_LIBS_$${NAME}_$$upper($$b) = $$val_escape($${1}.builds.$${b})"
@@ -853,8 +853,8 @@ defineReplace(qtConfLibraryArgs) {
         for (use, depends): \
             dep_uses += $$section(use, :, 1, 1)
         qmake_args += \
-            "QMAKE_DEPENDS_$${NAME}_CC = $$upper($$dep_uses)" \
-            "QMAKE_DEPENDS_$${NAME}_LD = $$upper($$dep_uses)"
+            "QMAKE_DEPENDS_$${NAME}_CC = $$upper($$replace(dep_uses, -, _))" \
+            "QMAKE_DEPENDS_$${NAME}_LD = $$upper($$replace(dep_uses, -, _))"
     }
     return($$qmake_args)
 }
@@ -917,7 +917,7 @@ defineTest(qtConfExportLibrary) {
             !isEmpty(use_cfg): \
                 depends += $$upper($$eval($${use_cfg}.libraries.$${use_lib}.export))
             else: \
-                depends += $$upper($$use_lib)
+                depends += $$upper($$replace(use_lib, -, _))
         }
         # we use suffixes instead of infixes, because $$resolve_depends() demands it.
         qtConfOutputVar(assign, $$output, QMAKE_DEPENDS_$${NAME}_CC, $$depends)
@@ -1092,7 +1092,7 @@ defineTest(qtConfTestPrepare_compile) {
             }
         }
         isEmpty(libConfig) {
-            nu = $$upper($$u)
+            nu = $$upper($$replace(u, -, _))
             !defined(QMAKE_LIBS_$$nu, var): \
                 error("Test $$1 tries to use undeclared library '$$u'")
             # using an external library by exported name.
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
index 05d3b941bd..2cb54fc547 100644
--- a/mkspecs/features/qt_helper_lib.prf
+++ b/mkspecs/features/qt_helper_lib.prf
@@ -31,6 +31,7 @@ THE_TARGET = $$qt5LibraryTarget($$TARGET)
 
 !build_pass {
     MODULE = $$replace(TARGET, ^qt, )
+    MODULE ~= s,-,_,
     MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_ext_$${MODULE}.pri
     ucmodule = $$upper($$MODULE)
 
@@ -46,7 +47,7 @@ THE_TARGET = $$qt5LibraryTarget($$TARGET)
     for (use, QMAKE_USE) {
         use = $$split(use, /)
         name = $$take_first(use)
-        nu = $$upper($$name)
+        nu = $$upper($$replace(name, -, _))
         !contains(use, linkonly): CC_USES += $$nu
         !contains(use, nolink): LD_USES += $$nu
     }
-- 
cgit v1.2.3


From 6b39d51a2c39569f984ef90e905bdf43958f5431 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 13 Jul 2018 18:33:17 +0200
Subject: configure: enable sharing of inlined source code between tests

this is implemented by means of (multiple) inheritance, which applies
specifically only to the inlined source and header list, but not to
library sources or dependencies.

Change-Id: I8f1d5b34d1d2d12e39225dc50357ad6ec648c6b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 59 +++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 83802cffca..72bbd42fa5 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -592,6 +592,16 @@ defineTest(qtConfResolvePathLibs) {
     return($$ret)
 }
 
+defineReplace(qtConfGetTestSourceList) {
+    result =
+    !isEmpty($${1}.test.inherit) {
+        base = $$section(1, ., 0, -2)
+        for (i, $${1}.test.inherit): \
+            result += $$qtConfGetTestSourceList($${base}.$$i)
+    }
+    return($$result $$1)
+}
+
 defineReplace(qtConfGetTestIncludes) {
     defined($${1}._KEYS_, var) {
         1st = $$first($${1}._KEYS_)
@@ -637,7 +647,10 @@ defineTest(qtConfResolvePathIncs) {
         # thus make the code below work.
         return($$ret)
     }
-    hdrs = $$qtConfGetTestIncludes($${3}.headers)
+    tests = $$qtConfGetTestSourceList($$3)
+    hdrs =
+    for (test, tests): \
+        hdrs += $$qtConfGetTestIncludes($${test}.headers)
     for (hdr, hdrs) {
         h = $$qtConfFindInPathList($$hdr, $$2 $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS)
         isEmpty(h) {
@@ -1109,10 +1122,14 @@ defineTest(qtConfTestPrepare_compile) {
 }
 
 defineTest(qtConfPrepareCompileTestSource) {
-    test_dir = $$3
+    test_dir = $$2
 
-    test_lang = $$eval($${1}.lang)
-    isEmpty(test_lang): test_lang = "c++"
+    tests = $$qtConfGetTestSourceList($$1)
+
+    test_lang = "c++"
+    for (test, tests): \
+        test_lang += $$eval($${test}.test.lang)
+    test_lang = $$last(test_lang)  # Last non-empty, that is.
 
     equals(test_lang, "c++"): suffix = "cpp"
     else: equals(test_lang, "c"): suffix = "c"
@@ -1123,25 +1140,30 @@ defineTest(qtConfPrepareCompileTestSource) {
     # Create source code
     contents = "/* Generated by configure */"
     # Custom code before includes
-    for (ent, $$qtConfScalarOrList($${1}.head)): \
-        contents += $$ent
+    for (test, tests): \
+        for (ent, $$qtConfScalarOrList($${test}.test.head)): \
+            contents += $$ent
     # Includes
-    hdrs = $$qtConfGetTestIncludes($${1}.include)
-    isEmpty(hdrs): \
-        hdrs = $$qtConfGetTestIncludes($$2)
-    for (ent, hdrs): \
-        contents += "$${LITERAL_HASH}include <$$ent>"
+    for (test, tests) {
+        hdrs = $$qtConfGetTestIncludes($${test}.test.include)
+        isEmpty(hdrs): \
+            hdrs = $$qtConfGetTestIncludes($${test}.headers)
+        for (ent, hdrs): \
+            contents += "$${LITERAL_HASH}include <$$ent>"
+    }
     # Custom code after includes
-    for (ent, $$qtConfScalarOrList($${1}.tail)): \
-        contents += $$ent
+    for (test, tests): \
+        for (ent, $$qtConfScalarOrList($${test}.test.tail)): \
+            contents += $$ent
     # And finally the custom code inside main()
     contents += \
         "int main(int argc, char **argv)" \
         "{" \
         "    (void)argc; (void)argv;" \
         "    /* BEGIN TEST: */"
-    for (ent, $$qtConfScalarOrList($${1}.main)): \
-        contents += "    $$ent"
+    for (test, tests): \
+        for (ent, $$qtConfScalarOrList($${test}.test.main)): \
+            contents += "    $$ent"
     contents += \
         "    /* END TEST */" \
         "    return 0;" \
@@ -1151,8 +1173,9 @@ defineTest(qtConfPrepareCompileTestSource) {
     # Create stub .pro file
     contents = "SOURCES = main.$$suffix"
     # Custom project code
-    for (ent, $$qtConfScalarOrList($${1}.qmake)): \
-        contents += $$ent
+    for (test, tests): \
+        for (ent, $$qtConfScalarOrList($${test}.test.qmake)): \
+            contents += $$ent
     write_file($$test_dir/$$basename(test_dir).pro, contents)|error()
 }
 
@@ -1165,7 +1188,7 @@ defineTest(qtConfTest_compile) {
     isEmpty(test) {
         test_dir = $$test_base_out_dir/$$section(1, ".", -1)
         test_out_dir = $$test_dir
-        qtConfPrepareCompileTestSource($${1}.test, $${1}.headers, $$test_dir)
+        qtConfPrepareCompileTestSource($$1, $$test_dir)
     } else {
         test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
         test_out_dir = $$test_base_out_dir/$$test
-- 
cgit v1.2.3


From 73b8769730701736cd0d05f904b69f2e7e35de1d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 13 Jul 2018 21:25:12 +0200
Subject: configure: enable inline tests to contain auxiliary files

... and use that to migrate the pch test.

Change-Id: I2ce884442cab6124c37142f571cf6f82191ee4f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 72bbd42fa5..f5aa444ade 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1170,6 +1170,11 @@ defineTest(qtConfPrepareCompileTestSource) {
         "}"
     write_file($$test_dir/main.$$suffix, contents)|error()
 
+    for (test, tests) {
+        for (file, $$qtConfScalarOrList($${test}.test.files._KEYS_)): \
+            write_file($$test_dir/$$file, $$qtConfScalarOrList($${test}.test.files.$${file}))|error()
+    }
+
     # Create stub .pro file
     contents = "SOURCES = main.$$suffix"
     # Custom project code
-- 
cgit v1.2.3


From 98689cd2f9d3e9e4dac33ccf6679b90d4b39284f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 16 Jul 2018 12:10:19 +0200
Subject: configure: enable inline tests to refer to PWD

... and use that to inline the xlocalescanprint test.

Change-Id: I0973133d7f9ecc9a38b70dc4b83df174a35b2b1f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index f5aa444ade..87190bc52a 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1178,9 +1178,10 @@ defineTest(qtConfPrepareCompileTestSource) {
     # Create stub .pro file
     contents = "SOURCES = main.$$suffix"
     # Custom project code
+    pwd = $$val_escape($${currentConfig}.dir)
     for (test, tests): \
         for (ent, $$qtConfScalarOrList($${test}.test.qmake)): \
-            contents += $$ent
+            contents += $$replace(ent, "@PWD@", $$pwd)
     write_file($$test_dir/$$basename(test_dir).pro, contents)|error()
 }
 
-- 
cgit v1.2.3


From 49c8595bf8f4563656498be9f99448526338acb3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 17 Dec 2018 21:18:18 +0100
Subject: qmake: fix typo in function name

Change-Id: Ie88ae0f13be83d6e63078eeb359d9ddf012c94fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index c7ea20e180..1a76e50b49 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -9,7 +9,7 @@ defineReplace(qtMakeExpand) {
     }
 }
 
-defineTest(qtCompilerErrror) {
+defineTest(qtCompilerError) {
     !cross_compile: \
         what =
     else: host_build: \
@@ -69,7 +69,7 @@ isEmpty($${target_prefix}.INCDIRS) {
             cxx_flags += -E -v
 
         output = $$system("$$cmd_prefix $$QMAKE_CXX $$qtMakeExpand($$cxx_flags) -xc++ - 2>&1 $$cmd_suffix", lines, ec)
-        !equals(ec, 0): qtCompilerErrror($$QMAKE_CXX, $$output)
+        !equals(ec, 0): qtCompilerError($$QMAKE_CXX, $$output)
 
         rim_qcc {
             for (line, output) {
@@ -129,7 +129,7 @@ isEmpty($${target_prefix}.INCDIRS) {
             # What's more, -print-search-dirs can't be used on clang on Apple because it
             # won't print all the library paths (only the clang-internal ones).
             output = $$system("$$cmd_prefix $$QMAKE_LINK $$QMAKE_LFLAGS -print-search-dirs", lines, ec)
-            !equals(ec, 0): qtCompilerErrror($$QMAKE_LINK, $$output)
+            !equals(ec, 0): qtCompilerError($$QMAKE_LINK, $$output)
 
             for (line, output) {
                 contains(line, "^libraries: .*") {
@@ -149,7 +149,7 @@ isEmpty($${target_prefix}.INCDIRS) {
     } else: ghs {
         cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
         output = $$system("$$cmd", blob, ec)
-        !equals(ec, 0): qtCompilerErrror($$QMAKE_CXX, $$output)
+        !equals(ec, 0): qtCompilerError($$QMAKE_CXX, $$output)
         output ~= s/\\\\\\n {8}//g
         output = $$split(output, $$escape_expand(\\n))
         for (line, output) {
@@ -199,14 +199,14 @@ isEmpty($${target_prefix}.INCDIRS) {
 
 defineReplace(qtVariablesFromMSVC) {
     ret = $$system("$$1 -nologo -E $$2 $$system_quote($$PWD/data/macros.cpp) 2>NUL", lines, ec)
-    !equals(ec, 0): qtCompilerErrror($$1, $$ret)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
     return($$ret)
 }
 
 defineReplace(qtVariablesFromGCC) {
     ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) \
         2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
-    !equals(ec, 0): qtCompilerErrror($$1, $$ret)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
     return($$ret)
 }
 
-- 
cgit v1.2.3


From e0926ca4260953a70cdb2a6f84da35517ead1349 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Wed, 19 Dec 2018 17:54:46 +0100
Subject: qmake: remove support for pre-5.6 qt module pris
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it seems rather obsolete by now.

Change-Id: I43a84367fbe9f82c3adc0e3825d14198e69eaa1f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 mkspecs/features/qt.prf | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index d16b3cf1be..5da82fdb5b 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -198,28 +198,6 @@ for(ever) {
         MODULE_LIBS_ADD = $$MODULE_LIBS
         MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
 
-        !contains(MODULE_CONFIG, v2) {
-            # Backwards compatibility with pre-5.6 module .pri files
-
-            contains(MODULE_CONFIG, lib_bundle) {
-                MODULE_FRAMEWORKS = $$MODULE_LIBS
-                inc = $$MODULE_LIBS/$${MODULE_NAME}.framework/Headers
-                MODULE_INCLUDES = $$inc
-                contains(MODULE_CONFIG, internal_module): \
-                    MODULE_INCLUDES += \
-                        $$inc/$$eval(QT.$${QTLIB}.VERSION) \
-                        $$inc/$$eval(QT.$${QTLIB}.VERSION)/$$MODULE_NAME
-            } else {
-                # Re-insert the major version in the library name (cf qt5LibraryTarget above)
-                MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
-            }
-
-            # Only link to this module if a libs directory is set, else this is just a module
-            # to give access to sources or include files, and not for linking.
-            !isEmpty(MODULE_LIBS):!contains(MODULE_CONFIG, no_link): \
-                MODULE_MODULE = $${MODULE_NAME}$${QT_LIBINFIX}
-        }
-
         # Frameworks shouldn't need include paths, but much code does not use
         # module-qualified #includes, so by default we add paths which point
         # directly into the frameworks. Private modules have somewhat convoluted
-- 
cgit v1.2.3


From 5af60d3b371360285af442d1ee194b44d681f297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 10 Dec 2018 23:37:54 +0100
Subject: macOS: Prevent checking for stale SDK without the required SDK name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's no need to check the SDK at the root exclusive-build Makefile,
we can leave it to the individual build passes where the SDK variable
is available.

Fixes: QTBUG-72449
Change-Id: Ic829babf4c76e6d20812de0b94120199ebfb300c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 mkspecs/features/mac/default_post.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 3881b432ef..8e2c5e603a 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -1,7 +1,7 @@
 load(default_post)
 
 contains(TEMPLATE, .*app) {
-    !macx-xcode {
+    !macx-xcode:if(isEmpty(BUILDS)|build_pass) {
         # Detect changes to the platform SDK
         QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH
         QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
-- 
cgit v1.2.3


From ef14c3dc1a6106673969bc55967c434761d33629 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 17 Dec 2018 21:16:27 +0100
Subject: qmake: reshuffle toolchain.prf

swap the order of compiler version detection and default path detection.
this keeps a subsequent commit smaller, which introduces a dependency
between the two.

Change-Id: I2d4cbee1fd3555411c18833bbee0201c994a9942
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/toolchain.prf | 209 +++++++++++++++++++++--------------------
 1 file changed, 106 insertions(+), 103 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 1a76e50b49..734a7fbf86 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -1,14 +1,3 @@
-
-defineReplace(qtMakeExpand) {
-    out = "$$1"
-    for(ever) {
-        m = $$replace(out, ".*\\$\\(EXPORT_([^)]+)\\).*", \\1)
-        equals(m, $$out): \
-            return($$out)
-        out = $$replace(out, "\\$\\(EXPORT_$$m\\)", $$eval($$m))
-    }
-}
-
 defineTest(qtCompilerError) {
     !cross_compile: \
         what =
@@ -30,6 +19,112 @@ cross_compile:host_build: \
 else: \
     target_prefix = QMAKE_CXX
 
+#
+# Determine and cache the compiler version
+#
+
+defineReplace(qtVariablesFromMSVC) {
+    ret = $$system("$$1 -nologo -E $$2 $$system_quote($$PWD/data/macros.cpp) 2>NUL", lines, ec)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
+    return($$ret)
+}
+
+defineReplace(qtVariablesFromGCC) {
+    ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) \
+        2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
+    return($$ret)
+}
+
+isEmpty($${target_prefix}.COMPILER_MACROS) {
+    msvc {
+        clang_cl {
+            # We need to obtain the cl.exe version first
+            vars = $$qtVariablesFromMSVC(cl)
+            for (v, vars) {
+                isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
+                eval($$v)
+            }
+            isEmpty(QMAKE_MSC_FULL_VER): error("Could not determine the Visual Studio version")
+
+            QMAKE_CFLAGS_MSVC_COMPAT = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", \
+                                                 "-fms-compatibility-version=\\1.\\2.\\3")
+            cache($${target_prefix}.QMAKE_CFLAGS_MSVC_COMPAT, set stash, QMAKE_CFLAGS_MSVC_COMPAT)
+            $${target_prefix}.COMPILER_MACROS += QMAKE_CFLAGS_MSVC_COMPAT
+            vars = $$qtVariablesFromMSVC($$QMAKE_CXX, $$QMAKE_CFLAGS_MSVC_COMPAT)
+        } else {
+            vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
+        }
+    } else: gcc|ghs {
+        vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+    }
+    for (v, vars) {
+        !contains(v, "[A-Z_]+ = .*"): next()
+        # Set both <varname> for the outer scope ...
+        eval($$v)
+        v ~= s/ .*//
+        isEmpty($$v): error("Compiler produced empty value for $${v}.")
+        # ... and save QMAKE_(HOST_)?CXX.<varname> in the cache.
+        cache($${target_prefix}.$$v, set stash, $$v)
+        $${target_prefix}.COMPILER_MACROS += $$v
+    }
+    cache($${target_prefix}.COMPILER_MACROS, set stash)
+} else {
+    # load from the cache
+    for (i, $${target_prefix}.COMPILER_MACROS): \
+        $$i = $$eval($${target_prefix}.$$i)
+}
+
+# Populate QMAKE_COMPILER_DEFINES and some compatibility variables.
+# The $$format_number() calls strip leading zeros to avoid misinterpretation as octal.
+QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
+!isEmpty(QMAKE_MSC_VER): \
+    QMAKE_COMPILER_DEFINES += _MSC_VER=$$QMAKE_MSC_VER _MSC_FULL_VER=$$QMAKE_MSC_FULL_VER
+!isEmpty(QMAKE_ICC_VER): \
+    QMAKE_COMPILER_DEFINES += __INTEL_COMPILER=$$QMAKE_ICC_VER __INTEL_COMPILER_UPDATE=$$QMAKE_ICC_UPDATE_VER
+!isEmpty(QMAKE_APPLE_CC): \
+    QMAKE_COMPILER_DEFINES += __APPLE_CC__=$$QMAKE_APPLE_CC
+!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += __clang__ \
+        __clang_major__=$$QMAKE_APPLE_CLANG_MAJOR_VERSION \
+        __clang_minor__=$$QMAKE_APPLE_CLANG_MINOR_VERSION \
+        __clang_patchlevel__=$$QMAKE_APPLE_CLANG_PATCH_VERSION
+!isEmpty(QMAKE_CLANG_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += __clang__ \
+        __clang_major__=$$QMAKE_CLANG_MAJOR_VERSION \
+        __clang_minor__=$$QMAKE_CLANG_MINOR_VERSION \
+        __clang_patchlevel__=$$QMAKE_CLANG_PATCH_VERSION
+!isEmpty(QMAKE_GCC_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += \
+        __GNUC__=$$QMAKE_GCC_MAJOR_VERSION \
+        __GNUC_MINOR__=$$QMAKE_GCC_MINOR_VERSION \
+        __GNUC_PATCHLEVEL__=$$QMAKE_GCC_PATCH_VERSION
+!isEmpty(QMAKE_GHS_VERSION): \
+    QMAKE_COMPILER_DEFINES += __ghs__ __GHS_VERSION_NUMBER=$$QMAKE_GHS_VERSION
+
+QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
+
+clang_cl|intel_icl {
+    include(../common/msvc-based-version.conf)
+} else: msvc {
+    include(../common/msvc-version.conf)
+}
+
+#
+# Determine and cache the default search paths
+#
+
+defineReplace(qtMakeExpand) {
+    out = "$$1"
+    for(ever) {
+        m = $$replace(out, ".*\\$\\(EXPORT_([^)]+)\\).*", \\1)
+        equals(m, $$out): \
+            return($$out)
+        out = $$replace(out, "\\$\\(EXPORT_$$m\\)", $$eval($$m))
+    }
+}
+
 isEmpty($${target_prefix}.INCDIRS) {
     #
     # Get default include and library paths from compiler
@@ -193,96 +288,4 @@ isEmpty($${target_prefix}.INCDIRS) {
     QMAKE_DEFAULT_LIBDIRS = $$eval($${target_prefix}.LIBDIRS)
 }
 
-#
-# Determine and cache the compiler version
-#
-
-defineReplace(qtVariablesFromMSVC) {
-    ret = $$system("$$1 -nologo -E $$2 $$system_quote($$PWD/data/macros.cpp) 2>NUL", lines, ec)
-    !equals(ec, 0): qtCompilerError($$1, $$ret)
-    return($$ret)
-}
-
-defineReplace(qtVariablesFromGCC) {
-    ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) \
-        2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
-    !equals(ec, 0): qtCompilerError($$1, $$ret)
-    return($$ret)
-}
-
-isEmpty($${target_prefix}.COMPILER_MACROS) {
-    msvc {
-        clang_cl {
-            # We need to obtain the cl.exe version first
-            vars = $$qtVariablesFromMSVC(cl)
-            for (v, vars) {
-                isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
-                eval($$v)
-            }
-            isEmpty(QMAKE_MSC_FULL_VER): error("Could not determine the Visual Studio version")
-
-            QMAKE_CFLAGS_MSVC_COMPAT = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", \
-                                                 "-fms-compatibility-version=\\1.\\2.\\3")
-            cache($${target_prefix}.QMAKE_CFLAGS_MSVC_COMPAT, set stash, QMAKE_CFLAGS_MSVC_COMPAT)
-            $${target_prefix}.COMPILER_MACROS += QMAKE_CFLAGS_MSVC_COMPAT
-            vars = $$qtVariablesFromMSVC($$QMAKE_CXX, $$QMAKE_CFLAGS_MSVC_COMPAT)
-        } else {
-            vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
-        }
-    } else: gcc|ghs {
-        vars = $$qtVariablesFromGCC($$QMAKE_CXX)
-    }
-    for (v, vars) {
-        !contains(v, "[A-Z_]+ = .*"): next()
-        # Set both <varname> for the outer scope ...
-        eval($$v)
-        v ~= s/ .*//
-        isEmpty($$v): error("Compiler produced empty value for $${v}.")
-        # ... and save QMAKE_(HOST_)?CXX.<varname> in the cache.
-        cache($${target_prefix}.$$v, set stash, $$v)
-        $${target_prefix}.COMPILER_MACROS += $$v
-    }
-    cache($${target_prefix}.COMPILER_MACROS, set stash)
-} else {
-    # load from the cache
-    for (i, $${target_prefix}.COMPILER_MACROS): \
-        $$i = $$eval($${target_prefix}.$$i)
-}
-
 unset(target_prefix)
-
-# Populate QMAKE_COMPILER_DEFINES and some compatibility variables.
-# The $$format_number() calls strip leading zeros to avoid misinterpretation as octal.
-QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
-!isEmpty(QMAKE_MSC_VER): \
-    QMAKE_COMPILER_DEFINES += _MSC_VER=$$QMAKE_MSC_VER _MSC_FULL_VER=$$QMAKE_MSC_FULL_VER
-!isEmpty(QMAKE_ICC_VER): \
-    QMAKE_COMPILER_DEFINES += __INTEL_COMPILER=$$QMAKE_ICC_VER __INTEL_COMPILER_UPDATE=$$QMAKE_ICC_UPDATE_VER
-!isEmpty(QMAKE_APPLE_CC): \
-    QMAKE_COMPILER_DEFINES += __APPLE_CC__=$$QMAKE_APPLE_CC
-!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION): \
-    QMAKE_COMPILER_DEFINES += __clang__ \
-        __clang_major__=$$QMAKE_APPLE_CLANG_MAJOR_VERSION \
-        __clang_minor__=$$QMAKE_APPLE_CLANG_MINOR_VERSION \
-        __clang_patchlevel__=$$QMAKE_APPLE_CLANG_PATCH_VERSION
-!isEmpty(QMAKE_CLANG_MAJOR_VERSION): \
-    QMAKE_COMPILER_DEFINES += __clang__ \
-        __clang_major__=$$QMAKE_CLANG_MAJOR_VERSION \
-        __clang_minor__=$$QMAKE_CLANG_MINOR_VERSION \
-        __clang_patchlevel__=$$QMAKE_CLANG_PATCH_VERSION
-!isEmpty(QMAKE_GCC_MAJOR_VERSION): \
-    QMAKE_COMPILER_DEFINES += \
-        __GNUC__=$$QMAKE_GCC_MAJOR_VERSION \
-        __GNUC_MINOR__=$$QMAKE_GCC_MINOR_VERSION \
-        __GNUC_PATCHLEVEL__=$$QMAKE_GCC_PATCH_VERSION
-!isEmpty(QMAKE_GHS_VERSION): \
-    QMAKE_COMPILER_DEFINES += __ghs__ __GHS_VERSION_NUMBER=$$QMAKE_GHS_VERSION
-
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
-
-clang_cl|intel_icl {
-    include(../common/msvc-based-version.conf)
-} else: msvc {
-    include(../common/msvc-version.conf)
-}
-- 
cgit v1.2.3


From 45e4dfb449fb15632e5144cf671e38943fa1455f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 17 Dec 2018 20:57:18 +0100
Subject: qmake: rewrite msvc/nmake cross-build environment setup

rather than reproducing vcvarsall.bat's functionality as hard-wired code
in the nmake generator, just invoke the actual script from
toolchain.prf. this is much easier, more future proof, and - critically
- makes the detected variables available to configure's new library &
header search facilities.

[ChangeLog][Important Behavior Changes][qmake][WinRT] Cross-builds will
now ignore pre-set values of %INCLUDE% and %LIB% when building target
executables. If necessary, use configure's -I and -L switches when
building Qt, and pass QMAKE_INCDIR and QMAKE_LIBDIR on qmake's command
line when building own projects.

Change-Id: I36f53e8880d6523f3f6f7a44d40d87d04bd06854
Reviewed-by: Thomas Miller <thomaslmiller91@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 mkspecs/features/data/dumpvcvars.bat  |  44 ++++++++++
 mkspecs/features/toolchain.prf        | 146 +++++++++++++++++++++++++++++++---
 mkspecs/winrt-arm-msvc2015/qmake.conf |   1 -
 mkspecs/winrt-arm-msvc2017/qmake.conf |   1 -
 mkspecs/winrt-x64-msvc2015/qmake.conf |   1 -
 mkspecs/winrt-x64-msvc2017/qmake.conf |   1 -
 mkspecs/winrt-x86-msvc2015/qmake.conf |   1 -
 mkspecs/winrt-x86-msvc2017/qmake.conf |   1 -
 8 files changed, 181 insertions(+), 15 deletions(-)
 create mode 100644 mkspecs/features/data/dumpvcvars.bat

(limited to 'mkspecs')

diff --git a/mkspecs/features/data/dumpvcvars.bat b/mkspecs/features/data/dumpvcvars.bat
new file mode 100644
index 0000000000..4721da2e39
--- /dev/null
+++ b/mkspecs/features/data/dumpvcvars.bat
@@ -0,0 +1,44 @@
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2018 The Qt Company Ltd.
+:: Contact: https://www.qt.io/licensing/
+::
+:: This file is part of the tools applications of the Qt Toolkit.
+::
+:: $QT_BEGIN_LICENSE:GPL-EXCEPT$
+:: Commercial License Usage
+:: Licensees holding valid commercial Qt licenses may use this file in
+:: accordance with the commercial license agreement provided with the
+:: Software or, alternatively, in accordance with the terms contained in
+:: a written agreement between you and The Qt Company. For licensing terms
+:: and conditions see https://www.qt.io/terms-conditions. For further
+:: information use the contact form at https://www.qt.io/contact-us.
+::
+:: GNU General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU
+:: General Public License version 3 as published by the Free Software
+:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+:: included in the packaging of this file. Please review the following
+:: information to ensure the GNU General Public License requirements will
+:: be met: https://www.gnu.org/licenses/gpl-3.0.html.
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+@echo off
+
+REM We clear INCLUDE and LIB, because we want to obtain pristine values.
+REM PATH cannot be cleared, because then the script does not even run,
+REM and it would be counterproductive anyway (see toolchain.prf).
+set INCLUDE=
+set LIB=
+
+call %* || exit 1
+REM VS2015 does not set errorlevel in case of failure.
+if "%INCLUDE%" == "" exit 1
+
+echo =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+echo %INCLUDE%
+echo %LIB%
+echo %PATH%
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 734a7fbf86..2a7cbabc54 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -1,3 +1,13 @@
+defineTest(qtToolchainError) {
+    msg = \
+        $$1 \
+        "===================" \
+        $$2 \
+        "===================" \
+        $$3
+    error($$join(msg, $$escape_expand(\\n)))
+}
+
 defineTest(qtCompilerError) {
     !cross_compile: \
         what =
@@ -5,13 +15,8 @@ defineTest(qtCompilerError) {
         what = " host"
     else: \
         what = " target"
-    msg = \
-        "Cannot run$$what compiler '$$1'. Output:" \
-        "===================" \
-        $$2 \
-        "===================" \
-        "Maybe you forgot to setup the environment?"
-    error($$join(msg, $$escape_expand(\\n)))
+    qtToolchainError("Cannot run$$what compiler '$$1'. Output:", $$2, \
+                     "Maybe you forgot to setup the environment?")
 }
 
 cross_compile:host_build: \
@@ -125,6 +130,36 @@ defineReplace(qtMakeExpand) {
     }
 }
 
+defineReplace(qtSplitPathList) {
+    paths = $$split(1, $$QMAKE_DIRLIST_SEP)
+    ret =
+    for (p, paths): \
+        ret += $$clean_path($$p)
+    return($$ret)
+}
+
+defineReplace(qtNmakePathList) {
+    paths =
+    for (p, 1): \
+        paths += $$shell_path($$p)
+    paths ~= s,$${LITERAL_HASH},^$${LITERAL_HASH},g
+    paths ~= s,\\$,\$\$,g
+    return($$join(paths, $$QMAKE_DIRLIST_SEP))
+}
+
+msvc {
+    arch = $$lower($$VCPROJ_ARCH)
+    equals(arch, x64): \  # may be "win32" or undefined
+        arch = amd64
+    else: !equals(arch, arm):!equals(arch, arm64): \  # may be "win32" or undefined
+        arch = x86
+    # Consider only WinRT and ARM64 desktop builds to be cross-builds -
+    # the host is assumed to be Intel and capable of running the target
+    # executables (so building for x64 on x86 will break).
+    winrt|equals(arch, arm64): \
+        CONFIG += msvc_cross
+}
+
 isEmpty($${target_prefix}.INCDIRS) {
     #
     # Get default include and library paths from compiler
@@ -264,9 +299,89 @@ isEmpty($${target_prefix}.INCDIRS) {
                 }
             }
         }
+    } else: msvc_cross {
+        # Use a batch file, because %VAR% in the system() call expands to
+        # the pre-script-call value, and !VAR! cannot be enabled outside
+        # a batch file without invoking another shell instance.
+        cmd = $$system_quote($$system_path($$PWD/data/dumpvcvars.bat))
+
+        hostArch = $$QMAKE_HOST.arch
+        equals(hostArch, x86_64): \
+            hostArch = amd64
+        !equals(arch, $$hostArch): \
+            arch = $${hostArch}_$$arch
+
+        isEmpty(MSVC_VER): \
+            error("Mkspec does not specify MSVC_VER. Cannot continue.")
+        versionAtLeast(MSVC_VER, 15.0) {
+            dir = $$(VSINSTALLDIR)
+            isEmpty(dir): \
+                dir = $$read_registry(HKLM, \
+                    "Software\\Microsoft\\VisualStudio\\SxS\\VS7\\$$MSVC_VER", 32)
+            isEmpty(dir): \
+                error("Failed to find the Visual Studio installation directory.")
+            cmd += $$system_quote($$dir\\VC\\Auxiliary\\Build\\vcvarsall.bat) $$arch
+        } else {
+            dir = $$(VCINSTALLDIR)
+            isEmpty(dir): \
+                dir = $$read_registry(HKLM, \
+                    "Software\\Microsoft\\VisualStudio\\$$MSVC_VER\\Setup\\VC\\ProductDir", 32)
+            isEmpty(dir): \
+                error("Failed to find the Visual C installation directory.")
+            cmd += $$system_quote($$dir\\vcvarsall.bat) $$arch
+        }
+        winrt: cmd += store
+
+        isEmpty(WINSDK_VER): \
+            error("Mkspec does not specify WINSDK_VER. Cannot continue.")
+        # We prefer the environment variable, because that may work around
+        # a broken registry entry after uninstalling a newer SDK.
+        # However, we do that only if the major+minor SDK version matches
+        # the one requested by the mkspec, as we might be building for a
+        # newer target than the host.
+        winsdk_ver = $$(WindowsSDKVersion)
+        !isEmpty(winsdk_ver) {
+            winsdk_ver ~= s,\\\\$,,  # Work around SDK breakage.
+            !equals(WINSDK_VER, $$replace(winsdk_ver, ^(\\d+\\.\\d+).*$, \\1)): \
+                winsdk_ver =
+        }
+        !isEmpty(winsdk_ver) {
+            cmd += $$winsdk_ver
+        } else {
+            winsdk_ver = $$read_registry(HKLM, \
+                "Software\\Microsoft\\Microsoft SDKs\\Windows\\v$$WINSDK_VER\\ProductVersion", 32)
+            isEmpty(winsdk_ver): \
+                error("Windows SDK $$WINSDK_VER requested by mkspec is not installed. Cannot continue.")
+            cmd += $${winsdk_ver}.0
+        }
+
+        output = $$system("$$cmd 2>&1", lines, ec)
+        !equals(ec, 0): \
+            qtToolchainError("SDK setup script failed. Output:", $$output, \
+                             "Command was: $$cmd")
+        lines = $$output
+        for(ever) {
+            isEmpty(lines): \
+                break()
+            line = $$take_first(lines)
+            equals(line, "=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+="): \
+                break()
+        }
+        !count(lines, 3): \
+            qtToolchainError("SDK setup script returned unexpected output:", $$output, \
+                             "Command was: $$cmd")
+
+        # These contain only paths for the target.
+        QMAKE_DEFAULT_INCDIRS = $$qtSplitPathList($$member(lines, 0))
+        QMAKE_DEFAULT_LIBDIRS = $$qtSplitPathList($$member(lines, 1))
+        # PATH is inherently for the host, and paths that are not shadowed
+        # by vcvarsall.bat are assumed to contain only tools that work for
+        # both host and target builds.
+        QMAKE_DEFAULT_PATH = $$qtSplitPathList($$member(lines, 2))
+        # We de-duplicate, because the script just prepends to the paths for
+        # the host, some of which are identical to the ones for the target.
+        QMAKE_DEFAULT_PATH = $$unique(QMAKE_DEFAULT_PATH)
     } else: msvc {
-        # This doesn't differentiate between host and target,
-        # but neither do the compilers.
         LIB = $$getenv("LIB")
         QMAKE_DEFAULT_LIBDIRS = $$split(LIB, $$QMAKE_DIRLIST_SEP)
         INCLUDE = $$getenv("INCLUDE")
@@ -283,9 +398,22 @@ isEmpty($${target_prefix}.INCDIRS) {
         cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
     !isEmpty(QMAKE_DEFAULT_LIBDIRS): \
         cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
+    !isEmpty(QMAKE_DEFAULT_PATH): \
+        cache($${target_prefix}.PATH, set stash, QMAKE_DEFAULT_PATH)
 } else {
     QMAKE_DEFAULT_INCDIRS = $$eval($${target_prefix}.INCDIRS)
     QMAKE_DEFAULT_LIBDIRS = $$eval($${target_prefix}.LIBDIRS)
+    QMAKE_DEFAULT_PATH = $$eval($${target_prefix}.PATH)
+}
+
+msvc_cross {
+    qmake_inc_exp.name = INCLUDE
+    qmake_inc_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_INCDIRS)
+    qmake_lib_exp.name = LIB
+    qmake_lib_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_LIBDIRS)
+    qmake_path_exp.name = PATH
+    qmake_path_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_PATH)
+    QMAKE_EXPORTED_VARIABLES += qmake_inc_exp qmake_lib_exp qmake_path_exp
 }
 
 unset(target_prefix)
diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf
index 8bca6f4af8..bc113d4954 100644
--- a/mkspecs/winrt-arm-msvc2015/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2015/qmake.conf
@@ -15,6 +15,5 @@ QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib One
 
 VCPROJ_ARCH             = ARM
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-arm-msvc2017/qmake.conf b/mkspecs/winrt-arm-msvc2017/qmake.conf
index bf571d620c..1160d5766d 100644
--- a/mkspecs/winrt-arm-msvc2017/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2017/qmake.conf
@@ -15,6 +15,5 @@ QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib One
 
 VCPROJ_ARCH             = ARM
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf
index d503399e3c..d1d1eb6513 100644
--- a/mkspecs/winrt-x64-msvc2015/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2015/qmake.conf
@@ -15,6 +15,5 @@ QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib One
 
 VCPROJ_ARCH             = x64
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x64-msvc2017/qmake.conf b/mkspecs/winrt-x64-msvc2017/qmake.conf
index cb2209fa23..dce896bd47 100644
--- a/mkspecs/winrt-x64-msvc2017/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2017/qmake.conf
@@ -15,6 +15,5 @@ QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib One
 
 VCPROJ_ARCH             = x64
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf
index 37ce0e5525..06f059b600 100644
--- a/mkspecs/winrt-x86-msvc2015/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2015/qmake.conf
@@ -14,6 +14,5 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86 /NODEFAULTLIB:kernel32.lib
 QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib
 VCPROJ_ARCH             = Win32
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = x86
diff --git a/mkspecs/winrt-x86-msvc2017/qmake.conf b/mkspecs/winrt-x86-msvc2017/qmake.conf
index 3c9506bbad..94fb68f6c0 100644
--- a/mkspecs/winrt-x86-msvc2017/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2017/qmake.conf
@@ -14,6 +14,5 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86 /NODEFAULTLIB:kernel32.lib
 QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib
 VCPROJ_ARCH             = Win32
 WINSDK_VER              = 10.0
-WINTARGET_VER           = winv10.0
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
 WINRT_MANIFEST.architecture = x86
-- 
cgit v1.2.3


From 5733dfbd90fd059e7310786faefb022b00289592 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 20 Dec 2018 16:30:51 +0100
Subject: qmake: make CONFIG+=egl work again

while it's legacy and should not be used (use QMAKE_USE+=egl instead),
it shouldn't be broken nonetheless.

amends 310bf3f57c.

Fixes: QTBUG-72564
Change-Id: Id6a070a4653dc1182a6b4d75af027a6ee6cbacae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
---
 mkspecs/features/egl.prf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mkspecs')

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
-- 
cgit v1.2.3