Fix a few issues with mingw-w64-qt5-* packages

* Mainly issues concerning static build and CMake * Qt WebKit doesn't build with latest ANGLE, though
2016-11-06 12:49:43 +01:00 · 2016-11-06 12:49:43 +01:00 · bbc65bcaed
parent aa4ac48702
commit bbc65bcaed
108 changed files with 1242 additions and 713 deletions
--- a/qt5-base/mingw-w64-angle/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+++ b/qt5-base/mingw-w64-angle/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
@ -18,5 +18,5 @@ index 39280de..e152b0d 100644
 +    win32:shared:LIBS_PRIVATE += -lfreetype
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0002-Fix-oci-config-test-on-windows.patch
+++ b/qt5-base/mingw-w64-angle/0002-Fix-oci-config-test-on-windows.patch
@ -17,5 +17,5 @@ index 3ffda1d..39b6f3759 100644
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+++ b/qt5-base/mingw-w64-angle/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
@ -21,5 +21,5 @@ index 43b55f0..de2c3ec 100755
     if compileTest unix/ipc_posix "ipc_posix" ; then
         QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0004-Fix-building-mysql-driver-under-mingw.patch
+++ b/qt5-base/mingw-w64-angle/0004-Fix-building-mysql-driver-under-mingw.patch
@ -21,5 +21,5 @@ index 3cfb614..8b7063f 100644
         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0005-Support-ANGLE-switches-via-configure-shell-script.patch
+++ b/qt5-base/mingw-w64-angle/0005-Support-ANGLE-switches-via-configure-shell-script.patch
@ -90,5 +90,5 @@ index f6cd0e5..17214a0 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0006-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-angle/0006-Use-external-ANGLE-library.patch
@ -94,5 +94,5 @@ index 71347dc..921c4d8 100644
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-angle/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -23,5 +23,5 @@ index b13f258..8a9093f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0008-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-angle/0008-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 0846cb2..543e905 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-angle/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -24,5 +24,5 @@ index 382b10c..3caad90 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0010-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-angle/0010-Prevent-debug-library-names-in-pkg-config-files.patch
@ -29,5 +29,5 @@ index a3f71ba..b4792fe 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-D-Bus.patch
@ -39,5 +39,5 @@ index fbeea61..8e73e9e 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0012-Adjust-win32-g-mkspecs-profile.patch
+++ b/qt5-base/mingw-w64-angle/0012-Adjust-win32-g-mkspecs-profile.patch
@ -71,5 +71,5 @@ index c5f6353..db92487 100644
 +
 load(qt_config)
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-external-harfbuzz.patch
+++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-external-harfbuzz.patch
@ -32,5 +32,5 @@ index 7443368..2932f05 100644
 +    else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz)
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-static-pcre.patch
@ -23,5 +23,5 @@ index e7f86dd..63fc683 100644
 
 QT_BEGIN_NAMESPACE
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
@ -52,5 +52,5 @@ index b497765..d63a684 100644
 
 CONFIG += static
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch
@ -34,5 +34,5 @@ index c3ed27d..30d2114 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch
@ -31,5 +31,5 @@ index 46aca50..e763602 100644
 INSTALLS += target
 
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch
@ -21,5 +21,5 @@ index a431052..b97ff0a 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@ -22,5 +22,5 @@ index cffffdc..6445481 100644
             cmd_prefix = "LC_ALL=C"
             cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
@ -76,5 +76,5 @@ index 543e905..456f21c 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
@ -118,5 +118,5 @@ index b4792fe..edd7918 100644
 
     t << endl;
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From bffbc47e284be9dfc24d2eae96713f6d3661a81c Mon Sep 17 00:00:00 2001
+From baadc36def778c99b33f68d2c840c176bb873d66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/25] Allow usage of static version with CMake
@ -7,18 +7,18 @@ Subject: [PATCH 22/25] Allow usage of static version with CMake
 - Allow selecting between dynamic and static Qt versions
  installed in the same prefix
  - Use eg. find_package(Qt5Core) for dynamic version
-  - and eg. find_package(StaticQt5Core) for dynamic version
+  - and eg. find_package(StaticQt5Core) for static version
 ---
- mkspecs/features/create_cmake.prf                  |  79 +++---
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 299 ++++++++++++++++-----
- .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 ++-
+ mkspecs/features/create_cmake.prf                  |  85 ++++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 338 +++++++++++++++------
+ .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
 qmake/generators/makefile.cpp                      |   7 +
 src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
 src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
- 6 files changed, 349 insertions(+), 115 deletions(-)
+ 6 files changed, 358 insertions(+), 151 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 0ff1c6d..7ed32df 100644
+index 0ff1c6d..d0d4a7f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,8 @@ split_incpath {
@ -31,7 +31,16 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += \
         cmake_extra_source_includes
-@@ -135,17 +136,19 @@ contains(CONFIG, plugin) {
+@@ -90,6 +91,8 @@ win32:!wince:!static:!staticlib {
+ }
+ 
+ static|staticlib:CMAKE_STATIC_TYPE = true
+static|staticlib:VAR_PREFIX = "Static"
+else:VAR_PREFIX = ""
+ 
+ CMAKE_DEBUG_TYPE =
+ CMAKE_RELEASE_TYPE =
+@@ -135,17 +138,19 @@ contains(CONFIG, plugin) {
     CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
 
     win32 {
@ -55,7 +64,7 @@ index 0ff1c6d..7ed32df 100644
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
             else: CMAKE_PlUGIN_EXT = .a
-@@ -161,13 +164,15 @@ contains(CONFIG, plugin) {
+@@ -161,13 +166,15 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -73,7 +82,7 @@ index 0ff1c6d..7ed32df 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -180,6 +185,8 @@ mod_deps =
+@@ -180,6 +187,8 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -82,10 +91,23 @@ index 0ff1c6d..7ed32df 100644
 # Until CMake 3.0 is the minimum requirement of Qt 5, we need to filter
 # out header-only modules from dependencies.  CMake 3.0 provides INTERFACE
 # libraries which are equivalent to header-only modules.
-@@ -197,10 +204,13 @@ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
+@@ -188,19 +197,26 @@ for (dep, sorted_deps) {
+     !contains(QT.$${dep}.module_config, no_link) {
+         mod_deps += $$cdep
+         lib_deps += Qt5::$$cdep
+        lib_deps_static += StaticQt5::$$cdep
+     } else {
+         aux_mod_deps += $$cdep
+         aux_lib_deps += Qt5::$$cdep
+        aux_lib_deps_static += StaticQt5::$$cdep
+     }
+ }
+ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
 CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";")
+CMAKE_QT5_MODULE_DEPS_STATIC = $$join(lib_deps_static, ";")
 CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";")
 CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
+CMAKE_INTERFACE_QT5_MODULE_DEPS_STATIC = $$join(aux_lib_deps_static, ";")
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
 
@ -96,7 +118,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -228,35 +238,33 @@ mac {
+@@ -228,35 +244,33 @@ mac {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
@ -151,7 +173,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -276,12 +284,14 @@ mac {
+@@ -276,12 +290,14 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -168,7 +190,7 @@ index 0ff1c6d..7ed32df 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -295,7 +305,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
+@@ -295,7 +311,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
 exists($$cmake_extras_file.input) {
 
     CMAKE_MODULE_EXTRAS = "true"
@ -178,7 +200,7 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -307,7 +318,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -307,7 +324,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -188,7 +210,7 @@ index 0ff1c6d..7ed32df 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -315,7 +327,8 @@ exists($$cmake_macros_file.input) {
+@@ -315,7 +333,8 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -199,39 +221,36 @@ index 0ff1c6d..7ed32df 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358ca..e2c17be 100644
+index d2358ca..89575ef 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -37,13 +37,25 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES_STATIC Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+-
+-set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF // TEMPLATE != aux
 
 -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
 -    if(NOT EXISTS \"${file}\" )
+-        message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
+-   \\\"${file}\\\"
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static FILE)
 +!!ELSE
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
 +!!ENDIF
 +    if(NOT EXISTS \"${FILE}\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        message(FATAL_ERROR \"The imported target \\\"Qt5::static::$${CMAKE_MODULE_NAME}\\\" references the file
-+!!ELSE
-         message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
-   \\\"${file}\\\"
-+!!ENDIF
+        message(FATAL_ERROR \"The imported target \\\"$${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
 +   \\\"${FILE}\\\"
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -54,44 +66,99 @@ but not all the files it references.
+@@ -54,44 +57,91 @@ but not all the files it references.
     endif()
 endmacro()
 
@ -317,12 +336,9 @@ index d2358ca..e2c17be 100644
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
 +!!ENDIF
     if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        set_target_properties(Qt5::static::$${CMAKE_MODULE_NAME} PROPERTIES
-+!!ELSE
-         set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+!!ENDIF
+        set_target_properties($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
@ -331,17 +347,58 @@ index d2358ca..e2c17be 100644
 !!ENDIF
 
 -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+set(TARGET_NAME $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 
 +if(NOT TARGET ${TARGET_NAME})
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -138,7 +205,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,33 +149,33 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+     )
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -134,11 +184,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 !!ENDIF
 
     foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
@ -353,7 +410,7 @@ index d2358ca..e2c17be 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -147,7 +218,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -147,16 +201,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -365,14 +422,102 @@ index d2358ca..e2c17be 100644
         endforeach()
     endif()
 !!ENDIF
-@@ -223,81 +298,191 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+ 
+-    set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+-    set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+ !!ENDIF // TEMPLATE != aux
+     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
+ 
+@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ 
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT EXACT)
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+ !!ENDIF // TEMPLATE != aux
+ 
+     foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES})
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            find_package(Qt5${_module_dep}
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            find_package($${VAR_PREFIX}Qt5${_module_dep}
+                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
+@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             )
+         endif()
+ 
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            set(Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+             return()
+         endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+ !!ENDIF // TEMPLATE != aux
+     endforeach()
+ !!IF !equals(TEMPLATE, aux)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+ !!ENDIF // TEMPLATE != aux
+ 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+    set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS_STATIC}\")
+!!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
+!!ENDIF
+ 
+ !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
+     if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
-+    add_library(Qt5::static::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+    add_library(StaticQt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
 +
 +    macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
 +        if (EXISTS \"${PRL_FILE_LOCATION}\")
@ -398,12 +543,12 @@ index d2358ca..e2c17be 100644
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
 +!!ENDIF
 +
@ -414,32 +559,26 @@ index d2358ca..e2c17be 100644
     add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
 !!ENDIF
 !!ENDIF
-+
-+!!IF !equals(TEMPLATE, aux)
-+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ELSE
-+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ENDIF
-+!!ENDIF
-+!!ENDIF // TEMPLATE != aux
 +
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 !!ENDIF
 !!ENDIF // TEMPLATE != aux
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
-+!!ELSE
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+!!IF !equals(TEMPLATE, aux)
+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 +!!ENDIF
+!!ENDIF // TEMPLATE != aux
+
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
 +    set(interface_compile_definitions $${MODULE_DEFINE})
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY
 +        INTERFACE_COMPILE_DEFINITIONS $${CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC} $${MODULE_DEFINE})
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ELSE
@ -452,11 +591,7 @@ index d2358ca..e2c17be 100644
 +    unset(pluginTargets)
 +    if(pluginTargetsMaybe)
 +        foreach(pluginTarget ${pluginTargetsMaybe})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC)
-+!!ELSE
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
-+!!ENDIF
+            file(STRINGS ${pluginTarget} matched REGEX $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
 +            if(matched)
 +                list(APPEND pluginTargets ${pluginTarget})
 +            endif()
@ -505,7 +640,7 @@ index d2358ca..e2c17be 100644
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 !!ELSE
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
@ -525,7 +660,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
 +    endif()
 +!!ELSE // CMAKE_STATIC_TYPE
     if (EXISTS
@ -575,12 +710,12 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 +!!ELSE
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +495,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -594,7 +729,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -323,37 +510,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -622,20 +757,14 @@ index d2358ca..e2c17be 100644
 -
 -
 !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
 !!ENDIF
 -
-+!!ENDIF
 !!IF !isEmpty(CMAKE_MODULE_MACROS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}Macros.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
 !!ENDIF
-+!!ENDIF
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
@ -645,7 +774,7 @@ index d2358ca..e2c17be 100644
 
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..a37e3bc 100644
+index 5baf0fd..54345e4 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,11 +1,31 @@
@ -653,8 +782,8 @@ index 5baf0fd..a37e3bc 100644
 -add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +# Some Qt modules also load plugin target in extra config, so check whether the target already exists
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+if(NOT TARGET Qt5::static::$$CMAKE_PLUGIN_NAME)
-+    add_library(Qt5::static::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+if(NOT TARGET StaticQt5::$$CMAKE_PLUGIN_NAME)
+    add_library(StaticQt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +!!ELSE
 +if(NOT TARGET Qt5::$$CMAKE_PLUGIN_NAME)
 +    add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
@ -663,7 +792,7 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!ENDIF
@ -671,14 +800,14 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!ENDIF
 +!!ENDIF
 +
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC Qt5::static::$$CMAKE_PLUGIN_NAME)
+    list(APPEND StaticQt5$${CMAKE_MODULE_NAME}_PLUGINS StaticQt5::$$CMAKE_PLUGIN_NAME)
 +!!ELSE
 +    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 !!ENDIF
@ -704,13 +833,13 @@ index edd7918..9f860da 100644
 }
 
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index a5ed8b2..b730734 100644
+index a5ed8b2..3375e1e 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -803,13 +932,13 @@ index a5ed8b2..b730734 100644
 +unset(_isExe)
 +!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911..e3b6a0a 100644
+index 2e32911..31567d7 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -839,5 +968,5 @@ index 2e32911..e3b6a0a 100644
         ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
     )
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From dd59260d2a1644664c1e1c7cb74abe5574b4989b Mon Sep 17 00:00:00 2001
+From aeec21b7d2c0185499531c55282d8738c19770f2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/25] Use correct pkg-config --static flag
@ -24,5 +24,5 @@ index b4c75c6..eea15f0 100755
 if [ -z "$PKG_CONFIG" ]; then
     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0024-Use-shared-static-version-of-MariaDB.patch
+++ b/qt5-base/mingw-w64-angle/0024-Use-shared-static-version-of-MariaDB.patch
@ -1,4 +1,4 @@
-From 69a3150b2a84984cc37e59e253c17fe88f5fa51e Mon Sep 17 00:00:00 2001
+From c49745c7dd018086e2566fed2a7a393fe21460d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 24/25] Use shared/static version of MariaDB
@ -21,5 +21,5 @@ index 06d1880..5dadbfb 100644
 +    LIBS += -lmariadbclient
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/0025-Use-shared-static-version-of-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-angle/0025-Use-shared-static-version-of-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5ae3a0b5e162d00a52fad34142f4c93512f8c2e5 Mon Sep 17 00:00:00 2001
+From 96cc0debf89c8c17413cc0d28a57f962ce20653e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 25/25] Use shared/static version of PostgreSQL
@ -21,5 +21,5 @@ index d0f3761..58f1638 100644
 +    LIBS *= -lpq
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@ -144,56 +144,56 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
        '0024-Use-shared-static-version-of-MariaDB.patch'
        '0025-Use-shared-static-version-of-PostgreSQL.patch')
 md5sums=('184f9460b40752d71b15b827260580c2'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24')
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11'
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 #_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
--- a/qt5-base/mingw-w64-dynamic/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+++ b/qt5-base/mingw-w64-dynamic/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
@ -18,5 +18,5 @@ index 39280de..e152b0d 100644
 +    win32:shared:LIBS_PRIVATE += -lfreetype
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0002-Fix-oci-config-test-on-windows.patch
+++ b/qt5-base/mingw-w64-dynamic/0002-Fix-oci-config-test-on-windows.patch
@ -17,5 +17,5 @@ index 3ffda1d..39b6f3759 100644
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+++ b/qt5-base/mingw-w64-dynamic/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
@ -21,5 +21,5 @@ index 43b55f0..de2c3ec 100755
     if compileTest unix/ipc_posix "ipc_posix" ; then
         QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0004-Fix-building-mysql-driver-under-mingw.patch
+++ b/qt5-base/mingw-w64-dynamic/0004-Fix-building-mysql-driver-under-mingw.patch
@ -21,5 +21,5 @@ index 3cfb614..8b7063f 100644
         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0005-Support-ANGLE-switches-via-configure-shell-script.patch
+++ b/qt5-base/mingw-w64-dynamic/0005-Support-ANGLE-switches-via-configure-shell-script.patch
@ -90,5 +90,5 @@ index f6cd0e5..17214a0 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0006-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0006-Use-external-ANGLE-library.patch
@ -94,5 +94,5 @@ index 71347dc..921c4d8 100644
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-dynamic/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -23,5 +23,5 @@ index b13f258..8a9093f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0008-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-dynamic/0008-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 0846cb2..543e905 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-dynamic/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -24,5 +24,5 @@ index 382b10c..3caad90 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0010-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-dynamic/0010-Prevent-debug-library-names-in-pkg-config-files.patch
@ -29,5 +29,5 @@ index a3f71ba..b4792fe 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-D-Bus.patch
@ -39,5 +39,5 @@ index fbeea61..8e73e9e 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0012-Adjust-win32-g-mkspecs-profile.patch
+++ b/qt5-base/mingw-w64-dynamic/0012-Adjust-win32-g-mkspecs-profile.patch
@ -71,5 +71,5 @@ index c5f6353..db92487 100644
 +
 load(qt_config)
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-external-harfbuzz.patch
+++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-external-harfbuzz.patch
@ -32,5 +32,5 @@ index 7443368..2932f05 100644
 +    else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz)
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-static-pcre.patch
@ -23,5 +23,5 @@ index e7f86dd..63fc683 100644
 
 QT_BEGIN_NAMESPACE
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch
@ -52,5 +52,5 @@ index b497765..d63a684 100644
 
 CONFIG += static
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch
@ -34,5 +34,5 @@ index c3ed27d..30d2114 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch
@ -31,5 +31,5 @@ index 46aca50..e763602 100644
 INSTALLS += target
 
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch
@ -21,5 +21,5 @@ index a431052..b97ff0a 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@ -22,5 +22,5 @@ index cffffdc..6445481 100644
             cmd_prefix = "LC_ALL=C"
             cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
@ -76,5 +76,5 @@ index 543e905..456f21c 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
@ -118,5 +118,5 @@ index b4792fe..edd7918 100644
 
     t << endl;
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From bffbc47e284be9dfc24d2eae96713f6d3661a81c Mon Sep 17 00:00:00 2001
+From baadc36def778c99b33f68d2c840c176bb873d66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/25] Allow usage of static version with CMake
@ -7,18 +7,18 @@ Subject: [PATCH 22/25] Allow usage of static version with CMake
 - Allow selecting between dynamic and static Qt versions
  installed in the same prefix
  - Use eg. find_package(Qt5Core) for dynamic version
-  - and eg. find_package(StaticQt5Core) for dynamic version
+  - and eg. find_package(StaticQt5Core) for static version
 ---
- mkspecs/features/create_cmake.prf                  |  79 +++---
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 299 ++++++++++++++++-----
- .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 ++-
+ mkspecs/features/create_cmake.prf                  |  85 ++++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 338 +++++++++++++++------
+ .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
 qmake/generators/makefile.cpp                      |   7 +
 src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
 src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
- 6 files changed, 349 insertions(+), 115 deletions(-)
+ 6 files changed, 358 insertions(+), 151 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 0ff1c6d..7ed32df 100644
+index 0ff1c6d..d0d4a7f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,8 @@ split_incpath {
@ -31,7 +31,16 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += \
         cmake_extra_source_includes
-@@ -135,17 +136,19 @@ contains(CONFIG, plugin) {
+@@ -90,6 +91,8 @@ win32:!wince:!static:!staticlib {
+ }
+ 
+ static|staticlib:CMAKE_STATIC_TYPE = true
+static|staticlib:VAR_PREFIX = "Static"
+else:VAR_PREFIX = ""
+ 
+ CMAKE_DEBUG_TYPE =
+ CMAKE_RELEASE_TYPE =
+@@ -135,17 +138,19 @@ contains(CONFIG, plugin) {
     CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
 
     win32 {
@ -55,7 +64,7 @@ index 0ff1c6d..7ed32df 100644
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
             else: CMAKE_PlUGIN_EXT = .a
-@@ -161,13 +164,15 @@ contains(CONFIG, plugin) {
+@@ -161,13 +166,15 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -73,7 +82,7 @@ index 0ff1c6d..7ed32df 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -180,6 +185,8 @@ mod_deps =
+@@ -180,6 +187,8 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -82,10 +91,23 @@ index 0ff1c6d..7ed32df 100644
 # Until CMake 3.0 is the minimum requirement of Qt 5, we need to filter
 # out header-only modules from dependencies.  CMake 3.0 provides INTERFACE
 # libraries which are equivalent to header-only modules.
-@@ -197,10 +204,13 @@ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
+@@ -188,19 +197,26 @@ for (dep, sorted_deps) {
+     !contains(QT.$${dep}.module_config, no_link) {
+         mod_deps += $$cdep
+         lib_deps += Qt5::$$cdep
+        lib_deps_static += StaticQt5::$$cdep
+     } else {
+         aux_mod_deps += $$cdep
+         aux_lib_deps += Qt5::$$cdep
+        aux_lib_deps_static += StaticQt5::$$cdep
+     }
+ }
+ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
 CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";")
+CMAKE_QT5_MODULE_DEPS_STATIC = $$join(lib_deps_static, ";")
 CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";")
 CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
+CMAKE_INTERFACE_QT5_MODULE_DEPS_STATIC = $$join(aux_lib_deps_static, ";")
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
 
@ -96,7 +118,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -228,35 +238,33 @@ mac {
+@@ -228,35 +244,33 @@ mac {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
@ -151,7 +173,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -276,12 +284,14 @@ mac {
+@@ -276,12 +290,14 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -168,7 +190,7 @@ index 0ff1c6d..7ed32df 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -295,7 +305,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
+@@ -295,7 +311,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
 exists($$cmake_extras_file.input) {
 
     CMAKE_MODULE_EXTRAS = "true"
@ -178,7 +200,7 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -307,7 +318,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -307,7 +324,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -188,7 +210,7 @@ index 0ff1c6d..7ed32df 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -315,7 +327,8 @@ exists($$cmake_macros_file.input) {
+@@ -315,7 +333,8 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -199,39 +221,36 @@ index 0ff1c6d..7ed32df 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358ca..e2c17be 100644
+index d2358ca..89575ef 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -37,13 +37,25 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES_STATIC Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+-
+-set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF // TEMPLATE != aux
 
 -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
 -    if(NOT EXISTS \"${file}\" )
+-        message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
+-   \\\"${file}\\\"
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static FILE)
 +!!ELSE
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
 +!!ENDIF
 +    if(NOT EXISTS \"${FILE}\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        message(FATAL_ERROR \"The imported target \\\"Qt5::static::$${CMAKE_MODULE_NAME}\\\" references the file
-+!!ELSE
-         message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
-   \\\"${file}\\\"
-+!!ENDIF
+        message(FATAL_ERROR \"The imported target \\\"$${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
 +   \\\"${FILE}\\\"
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -54,44 +66,99 @@ but not all the files it references.
+@@ -54,44 +57,91 @@ but not all the files it references.
     endif()
 endmacro()
 
@ -317,12 +336,9 @@ index d2358ca..e2c17be 100644
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
 +!!ENDIF
     if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        set_target_properties(Qt5::static::$${CMAKE_MODULE_NAME} PROPERTIES
-+!!ELSE
-         set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+!!ENDIF
+        set_target_properties($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
@ -331,17 +347,58 @@ index d2358ca..e2c17be 100644
 !!ENDIF
 
 -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+set(TARGET_NAME $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 
 +if(NOT TARGET ${TARGET_NAME})
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -138,7 +205,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,33 +149,33 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+     )
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -134,11 +184,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 !!ENDIF
 
     foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
@ -353,7 +410,7 @@ index d2358ca..e2c17be 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -147,7 +218,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -147,16 +201,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -365,14 +422,102 @@ index d2358ca..e2c17be 100644
         endforeach()
     endif()
 !!ENDIF
-@@ -223,81 +298,191 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+ 
+-    set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+-    set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+ !!ENDIF // TEMPLATE != aux
+     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
+ 
+@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ 
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT EXACT)
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+ !!ENDIF // TEMPLATE != aux
+ 
+     foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES})
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            find_package(Qt5${_module_dep}
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            find_package($${VAR_PREFIX}Qt5${_module_dep}
+                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
+@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             )
+         endif()
+ 
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            set(Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+             return()
+         endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+ !!ENDIF // TEMPLATE != aux
+     endforeach()
+ !!IF !equals(TEMPLATE, aux)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+ !!ENDIF // TEMPLATE != aux
+ 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+    set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS_STATIC}\")
+!!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
+!!ENDIF
+ 
+ !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
+     if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
-+    add_library(Qt5::static::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+    add_library(StaticQt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
 +
 +    macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
 +        if (EXISTS \"${PRL_FILE_LOCATION}\")
@ -398,12 +543,12 @@ index d2358ca..e2c17be 100644
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
 +!!ENDIF
 +
@ -414,32 +559,26 @@ index d2358ca..e2c17be 100644
     add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
 !!ENDIF
 !!ENDIF
-+
-+!!IF !equals(TEMPLATE, aux)
-+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ELSE
-+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ENDIF
-+!!ENDIF
-+!!ENDIF // TEMPLATE != aux
 +
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 !!ENDIF
 !!ENDIF // TEMPLATE != aux
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
-+!!ELSE
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+!!IF !equals(TEMPLATE, aux)
+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 +!!ENDIF
+!!ENDIF // TEMPLATE != aux
+
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
 +    set(interface_compile_definitions $${MODULE_DEFINE})
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY
 +        INTERFACE_COMPILE_DEFINITIONS $${CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC} $${MODULE_DEFINE})
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ELSE
@ -452,11 +591,7 @@ index d2358ca..e2c17be 100644
 +    unset(pluginTargets)
 +    if(pluginTargetsMaybe)
 +        foreach(pluginTarget ${pluginTargetsMaybe})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC)
-+!!ELSE
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
-+!!ENDIF
+            file(STRINGS ${pluginTarget} matched REGEX $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
 +            if(matched)
 +                list(APPEND pluginTargets ${pluginTarget})
 +            endif()
@ -505,7 +640,7 @@ index d2358ca..e2c17be 100644
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 !!ELSE
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
@ -525,7 +660,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
 +    endif()
 +!!ELSE // CMAKE_STATIC_TYPE
     if (EXISTS
@ -575,12 +710,12 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 +!!ELSE
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +495,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -594,7 +729,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -323,37 +510,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -622,20 +757,14 @@ index d2358ca..e2c17be 100644
 -
 -
 !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
 !!ENDIF
 -
-+!!ENDIF
 !!IF !isEmpty(CMAKE_MODULE_MACROS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}Macros.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
 !!ENDIF
-+!!ENDIF
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
@ -645,7 +774,7 @@ index d2358ca..e2c17be 100644
 
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..a37e3bc 100644
+index 5baf0fd..54345e4 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,11 +1,31 @@
@ -653,8 +782,8 @@ index 5baf0fd..a37e3bc 100644
 -add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +# Some Qt modules also load plugin target in extra config, so check whether the target already exists
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+if(NOT TARGET Qt5::static::$$CMAKE_PLUGIN_NAME)
-+    add_library(Qt5::static::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+if(NOT TARGET StaticQt5::$$CMAKE_PLUGIN_NAME)
+    add_library(StaticQt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +!!ELSE
 +if(NOT TARGET Qt5::$$CMAKE_PLUGIN_NAME)
 +    add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
@ -663,7 +792,7 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!ENDIF
@ -671,14 +800,14 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!ENDIF
 +!!ENDIF
 +
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC Qt5::static::$$CMAKE_PLUGIN_NAME)
+    list(APPEND StaticQt5$${CMAKE_MODULE_NAME}_PLUGINS StaticQt5::$$CMAKE_PLUGIN_NAME)
 +!!ELSE
 +    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 !!ENDIF
@ -704,13 +833,13 @@ index edd7918..9f860da 100644
 }
 
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index a5ed8b2..b730734 100644
+index a5ed8b2..3375e1e 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -803,13 +932,13 @@ index a5ed8b2..b730734 100644
 +unset(_isExe)
 +!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911..e3b6a0a 100644
+index 2e32911..31567d7 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -839,5 +968,5 @@ index 2e32911..e3b6a0a 100644
         ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
     )
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From dd59260d2a1644664c1e1c7cb74abe5574b4989b Mon Sep 17 00:00:00 2001
+From aeec21b7d2c0185499531c55282d8738c19770f2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/25] Use correct pkg-config --static flag
@ -24,5 +24,5 @@ index b4c75c6..eea15f0 100755
 if [ -z "$PKG_CONFIG" ]; then
     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0024-Use-shared-static-version-of-MariaDB.patch
+++ b/qt5-base/mingw-w64-dynamic/0024-Use-shared-static-version-of-MariaDB.patch
@ -1,4 +1,4 @@
-From 69a3150b2a84984cc37e59e253c17fe88f5fa51e Mon Sep 17 00:00:00 2001
+From c49745c7dd018086e2566fed2a7a393fe21460d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 24/25] Use shared/static version of MariaDB
@ -21,5 +21,5 @@ index 06d1880..5dadbfb 100644
 +    LIBS += -lmariadbclient
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/0025-Use-shared-static-version-of-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-dynamic/0025-Use-shared-static-version-of-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5ae3a0b5e162d00a52fad34142f4c93512f8c2e5 Mon Sep 17 00:00:00 2001
+From 96cc0debf89c8c17413cc0d28a57f962ce20653e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 25/25] Use shared/static version of PostgreSQL
@ -21,5 +21,5 @@ index d0f3761..58f1638 100644
 +    LIBS *= -lpq
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@ -144,56 +144,56 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
        '0024-Use-shared-static-version-of-MariaDB.patch'
        '0025-Use-shared-static-version-of-PostgreSQL.patch')
 md5sums=('184f9460b40752d71b15b827260580c2'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24')
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11'
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 #_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
--- a/qt5-base/mingw-w64-static/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+++ b/qt5-base/mingw-w64-static/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
@ -18,5 +18,5 @@ index 39280de..e152b0d 100644
 +    win32:shared:LIBS_PRIVATE += -lfreetype
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0002-Fix-oci-config-test-on-windows.patch
+++ b/qt5-base/mingw-w64-static/0002-Fix-oci-config-test-on-windows.patch
@ -17,5 +17,5 @@ index 3ffda1d..39b6f3759 100644
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+++ b/qt5-base/mingw-w64-static/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
@ -21,5 +21,5 @@ index 43b55f0..de2c3ec 100755
     if compileTest unix/ipc_posix "ipc_posix" ; then
         QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0004-Fix-building-mysql-driver-under-mingw.patch
+++ b/qt5-base/mingw-w64-static/0004-Fix-building-mysql-driver-under-mingw.patch
@ -21,5 +21,5 @@ index 3cfb614..8b7063f 100644
         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0005-Support-ANGLE-switches-via-configure-shell-script.patch
+++ b/qt5-base/mingw-w64-static/0005-Support-ANGLE-switches-via-configure-shell-script.patch
@ -90,5 +90,5 @@ index f6cd0e5..17214a0 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0006-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-static/0006-Use-external-ANGLE-library.patch
@ -94,5 +94,5 @@ index 71347dc..921c4d8 100644
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-static/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -23,5 +23,5 @@ index b13f258..8a9093f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0008-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-static/0008-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 0846cb2..543e905 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-static/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -24,5 +24,5 @@ index 382b10c..3caad90 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0010-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-static/0010-Prevent-debug-library-names-in-pkg-config-files.patch
@ -29,5 +29,5 @@ index a3f71ba..b4792fe 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-D-Bus.patch
@ -39,5 +39,5 @@ index fbeea61..8e73e9e 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0012-Adjust-win32-g-mkspecs-profile.patch
+++ b/qt5-base/mingw-w64-static/0012-Adjust-win32-g-mkspecs-profile.patch
@ -71,5 +71,5 @@ index c5f6353..db92487 100644
 +
 load(qt_config)
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-external-harfbuzz.patch
+++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-external-harfbuzz.patch
@ -32,5 +32,5 @@ index 7443368..2932f05 100644
 +    else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz)
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-static-pcre.patch
@ -23,5 +23,5 @@ index e7f86dd..63fc683 100644
 
 QT_BEGIN_NAMESPACE
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
@ -52,5 +52,5 @@ index b497765..d63a684 100644
 
 CONFIG += static
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch
@ -34,5 +34,5 @@ index c3ed27d..30d2114 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch
@ -31,5 +31,5 @@ index 46aca50..e763602 100644
 INSTALLS += target
 
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch
@ -21,5 +21,5 @@ index a431052..b97ff0a 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@ -22,5 +22,5 @@ index cffffdc..6445481 100644
             cmd_prefix = "LC_ALL=C"
             cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
@ -76,5 +76,5 @@ index 543e905..456f21c 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
@ -118,5 +118,5 @@ index b4792fe..edd7918 100644
 
     t << endl;
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From bffbc47e284be9dfc24d2eae96713f6d3661a81c Mon Sep 17 00:00:00 2001
+From baadc36def778c99b33f68d2c840c176bb873d66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/25] Allow usage of static version with CMake
@ -7,18 +7,18 @@ Subject: [PATCH 22/25] Allow usage of static version with CMake
 - Allow selecting between dynamic and static Qt versions
  installed in the same prefix
  - Use eg. find_package(Qt5Core) for dynamic version
-  - and eg. find_package(StaticQt5Core) for dynamic version
+  - and eg. find_package(StaticQt5Core) for static version
 ---
- mkspecs/features/create_cmake.prf                  |  79 +++---
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 299 ++++++++++++++++-----
- .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 ++-
+ mkspecs/features/create_cmake.prf                  |  85 ++++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 338 +++++++++++++++------
+ .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
 qmake/generators/makefile.cpp                      |   7 +
 src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
 src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
- 6 files changed, 349 insertions(+), 115 deletions(-)
+ 6 files changed, 358 insertions(+), 151 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 0ff1c6d..7ed32df 100644
+index 0ff1c6d..d0d4a7f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,8 @@ split_incpath {
@ -31,7 +31,16 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += \
         cmake_extra_source_includes
-@@ -135,17 +136,19 @@ contains(CONFIG, plugin) {
+@@ -90,6 +91,8 @@ win32:!wince:!static:!staticlib {
+ }
+ 
+ static|staticlib:CMAKE_STATIC_TYPE = true
+static|staticlib:VAR_PREFIX = "Static"
+else:VAR_PREFIX = ""
+ 
+ CMAKE_DEBUG_TYPE =
+ CMAKE_RELEASE_TYPE =
+@@ -135,17 +138,19 @@ contains(CONFIG, plugin) {
     CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
 
     win32 {
@ -55,7 +64,7 @@ index 0ff1c6d..7ed32df 100644
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
             else: CMAKE_PlUGIN_EXT = .a
-@@ -161,13 +164,15 @@ contains(CONFIG, plugin) {
+@@ -161,13 +166,15 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -73,7 +82,7 @@ index 0ff1c6d..7ed32df 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -180,6 +185,8 @@ mod_deps =
+@@ -180,6 +187,8 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -82,10 +91,23 @@ index 0ff1c6d..7ed32df 100644
 # Until CMake 3.0 is the minimum requirement of Qt 5, we need to filter
 # out header-only modules from dependencies.  CMake 3.0 provides INTERFACE
 # libraries which are equivalent to header-only modules.
-@@ -197,10 +204,13 @@ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
+@@ -188,19 +197,26 @@ for (dep, sorted_deps) {
+     !contains(QT.$${dep}.module_config, no_link) {
+         mod_deps += $$cdep
+         lib_deps += Qt5::$$cdep
+        lib_deps_static += StaticQt5::$$cdep
+     } else {
+         aux_mod_deps += $$cdep
+         aux_lib_deps += Qt5::$$cdep
+        aux_lib_deps_static += StaticQt5::$$cdep
+     }
+ }
+ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
 CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";")
+CMAKE_QT5_MODULE_DEPS_STATIC = $$join(lib_deps_static, ";")
 CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";")
 CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
+CMAKE_INTERFACE_QT5_MODULE_DEPS_STATIC = $$join(aux_lib_deps_static, ";")
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
 
@ -96,7 +118,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -228,35 +238,33 @@ mac {
+@@ -228,35 +244,33 @@ mac {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
@ -151,7 +173,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -276,12 +284,14 @@ mac {
+@@ -276,12 +290,14 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -168,7 +190,7 @@ index 0ff1c6d..7ed32df 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -295,7 +305,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
+@@ -295,7 +311,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
 exists($$cmake_extras_file.input) {
 
     CMAKE_MODULE_EXTRAS = "true"
@ -178,7 +200,7 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -307,7 +318,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -307,7 +324,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -188,7 +210,7 @@ index 0ff1c6d..7ed32df 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -315,7 +327,8 @@ exists($$cmake_macros_file.input) {
+@@ -315,7 +333,8 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -199,39 +221,36 @@ index 0ff1c6d..7ed32df 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358ca..e2c17be 100644
+index d2358ca..89575ef 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -37,13 +37,25 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES_STATIC Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+-
+-set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF // TEMPLATE != aux
 
 -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
 -    if(NOT EXISTS \"${file}\" )
+-        message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
+-   \\\"${file}\\\"
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static FILE)
 +!!ELSE
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
 +!!ENDIF
 +    if(NOT EXISTS \"${FILE}\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        message(FATAL_ERROR \"The imported target \\\"Qt5::static::$${CMAKE_MODULE_NAME}\\\" references the file
-+!!ELSE
-         message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
-   \\\"${file}\\\"
-+!!ENDIF
+        message(FATAL_ERROR \"The imported target \\\"$${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
 +   \\\"${FILE}\\\"
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -54,44 +66,99 @@ but not all the files it references.
+@@ -54,44 +57,91 @@ but not all the files it references.
     endif()
 endmacro()
 
@ -317,12 +336,9 @@ index d2358ca..e2c17be 100644
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
 +!!ENDIF
     if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        set_target_properties(Qt5::static::$${CMAKE_MODULE_NAME} PROPERTIES
-+!!ELSE
-         set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+!!ENDIF
+        set_target_properties($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
@ -331,17 +347,58 @@ index d2358ca..e2c17be 100644
 !!ENDIF
 
 -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+set(TARGET_NAME $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 
 +if(NOT TARGET ${TARGET_NAME})
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -138,7 +205,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,33 +149,33 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+     )
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -134,11 +184,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 !!ENDIF
 
     foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
@ -353,7 +410,7 @@ index d2358ca..e2c17be 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -147,7 +218,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -147,16 +201,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -365,14 +422,102 @@ index d2358ca..e2c17be 100644
         endforeach()
     endif()
 !!ENDIF
-@@ -223,81 +298,191 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+ 
+-    set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+-    set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+ !!ENDIF // TEMPLATE != aux
+     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
+ 
+@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ 
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT EXACT)
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+ !!ENDIF // TEMPLATE != aux
+ 
+     foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES})
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            find_package(Qt5${_module_dep}
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            find_package($${VAR_PREFIX}Qt5${_module_dep}
+                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
+@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             )
+         endif()
+ 
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            set(Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+             return()
+         endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+ !!ENDIF // TEMPLATE != aux
+     endforeach()
+ !!IF !equals(TEMPLATE, aux)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+ !!ENDIF // TEMPLATE != aux
+ 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+    set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS_STATIC}\")
+!!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
+!!ENDIF
+ 
+ !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
+     if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
-+    add_library(Qt5::static::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+    add_library(StaticQt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
 +
 +    macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
 +        if (EXISTS \"${PRL_FILE_LOCATION}\")
@ -398,12 +543,12 @@ index d2358ca..e2c17be 100644
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
 +!!ENDIF
 +
@ -414,32 +559,26 @@ index d2358ca..e2c17be 100644
     add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
 !!ENDIF
 !!ENDIF
-+
-+!!IF !equals(TEMPLATE, aux)
-+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ELSE
-+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ENDIF
-+!!ENDIF
-+!!ENDIF // TEMPLATE != aux
 +
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 !!ENDIF
 !!ENDIF // TEMPLATE != aux
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
-+!!ELSE
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+!!IF !equals(TEMPLATE, aux)
+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 +!!ENDIF
+!!ENDIF // TEMPLATE != aux
+
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
 +    set(interface_compile_definitions $${MODULE_DEFINE})
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY
 +        INTERFACE_COMPILE_DEFINITIONS $${CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC} $${MODULE_DEFINE})
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ELSE
@ -452,11 +591,7 @@ index d2358ca..e2c17be 100644
 +    unset(pluginTargets)
 +    if(pluginTargetsMaybe)
 +        foreach(pluginTarget ${pluginTargetsMaybe})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC)
-+!!ELSE
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
-+!!ENDIF
+            file(STRINGS ${pluginTarget} matched REGEX $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
 +            if(matched)
 +                list(APPEND pluginTargets ${pluginTarget})
 +            endif()
@ -505,7 +640,7 @@ index d2358ca..e2c17be 100644
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 !!ELSE
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
@ -525,7 +660,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
 +    endif()
 +!!ELSE // CMAKE_STATIC_TYPE
     if (EXISTS
@ -575,12 +710,12 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 +!!ELSE
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +495,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -594,7 +729,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -323,37 +510,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -622,20 +757,14 @@ index d2358ca..e2c17be 100644
 -
 -
 !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
 !!ENDIF
 -
-+!!ENDIF
 !!IF !isEmpty(CMAKE_MODULE_MACROS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}Macros.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
 !!ENDIF
-+!!ENDIF
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
@ -645,7 +774,7 @@ index d2358ca..e2c17be 100644
 
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..a37e3bc 100644
+index 5baf0fd..54345e4 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,11 +1,31 @@
@ -653,8 +782,8 @@ index 5baf0fd..a37e3bc 100644
 -add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +# Some Qt modules also load plugin target in extra config, so check whether the target already exists
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+if(NOT TARGET Qt5::static::$$CMAKE_PLUGIN_NAME)
-+    add_library(Qt5::static::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+if(NOT TARGET StaticQt5::$$CMAKE_PLUGIN_NAME)
+    add_library(StaticQt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +!!ELSE
 +if(NOT TARGET Qt5::$$CMAKE_PLUGIN_NAME)
 +    add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
@ -663,7 +792,7 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!ENDIF
@ -671,14 +800,14 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!ENDIF
 +!!ENDIF
 +
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC Qt5::static::$$CMAKE_PLUGIN_NAME)
+    list(APPEND StaticQt5$${CMAKE_MODULE_NAME}_PLUGINS StaticQt5::$$CMAKE_PLUGIN_NAME)
 +!!ELSE
 +    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 !!ENDIF
@ -704,13 +833,13 @@ index edd7918..9f860da 100644
 }
 
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index a5ed8b2..b730734 100644
+index a5ed8b2..3375e1e 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -803,13 +932,13 @@ index a5ed8b2..b730734 100644
 +unset(_isExe)
 +!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911..e3b6a0a 100644
+index 2e32911..31567d7 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -839,5 +968,5 @@ index 2e32911..e3b6a0a 100644
         ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
     )
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From dd59260d2a1644664c1e1c7cb74abe5574b4989b Mon Sep 17 00:00:00 2001
+From aeec21b7d2c0185499531c55282d8738c19770f2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/25] Use correct pkg-config --static flag
@ -24,5 +24,5 @@ index b4c75c6..eea15f0 100755
 if [ -z "$PKG_CONFIG" ]; then
     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0024-Use-shared-static-version-of-MariaDB.patch
+++ b/qt5-base/mingw-w64-static/0024-Use-shared-static-version-of-MariaDB.patch
@ -1,4 +1,4 @@
-From 69a3150b2a84984cc37e59e253c17fe88f5fa51e Mon Sep 17 00:00:00 2001
+From c49745c7dd018086e2566fed2a7a393fe21460d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 24/25] Use shared/static version of MariaDB
@ -21,5 +21,5 @@ index 06d1880..5dadbfb 100644
 +    LIBS += -lmariadbclient
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/0025-Use-shared-static-version-of-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-static/0025-Use-shared-static-version-of-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5ae3a0b5e162d00a52fad34142f4c93512f8c2e5 Mon Sep 17 00:00:00 2001
+From 96cc0debf89c8c17413cc0d28a57f962ce20653e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 25/25] Use shared/static version of PostgreSQL
@ -21,5 +21,5 @@ index d0f3761..58f1638 100644
 +    LIBS *= -lpq
 +}
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -144,56 +144,56 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
        '0024-Use-shared-static-version-of-MariaDB.patch'
        '0025-Use-shared-static-version-of-PostgreSQL.patch')
 md5sums=('184f9460b40752d71b15b827260580c2'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24'
-         'b8a6e20f50f55d8b3bca086c3e5e7d3e'
-         '543165bf85f22304fb53fbf824c3cc0a'
-         '64e34f4240f952316ab44e08e61e8864'
-         'af148b12f24121ac162eb8eb9bc682f0'
-         '377dbf2e3a2e9c7af0acba1cf3491efa'
-         '83c845f88038ae08719024a7bb6784c2'
-         '1e5f6c0ccafef813e42ad42dc68f4e82'
-         'df7c829842324478521890589bbe4f4f'
-         'cd334aa150e9f5a1edca36e7cc1e27ac'
-         'da489185f3981aa293bd6728cc6cdb65'
-         '0f5f6a6ea75f92a80c3921901e8e85c2'
-         '875f4c01d6b38b20b24c9143699a7610'
-         'c75403b9584edcf090ed3c78f95cca43'
-         'b6e8cfe3f286293fca1637cf84ae25b5'
-         'ee057cc23b76cbb2afef546ec0e134d6'
-         'af7ec298cc61a33d3f94063ef3c005bd'
-         '46527f0d4191410a23db3b1282475af6'
-         'ce02ce4daa0cdf64bcb23f0738626890'
-         '743257054d8481c34d392753c337662e'
-         '4e9ffe1265b6c426466e7e43c7593f59'
-         'c0295489d0c88baab425cec1967a7ce6'
-         'f1825e4c826642b7694b28ec8a849567'
-         '598ea5adfac3377f9ff191abb97cd5b0'
-         'dcd3379a381aa8aeefccd99a3c3658b4'
-         'a5d59627a473d8d40e5db2bf8d162f24')
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11'
+         'bd3a336834d1dc22bacf38688b30fab0'
+         '390cd5b394fe2a84054c4c34f9f016d6'
+         'ec43bd375737a578bf7494e14e5726e9'
+         '358dd9465914f52d8988228c656c508a'
+         '455134d76b818a994084dd45b11ce51e'
+         '84fd7ed12061aba4bf8648a5cbd72095'
+         'dcd5889407bc6fd8637bbb04a033ae6a'
+         '9de955e67e3f0f35d955021ced9dd544'
+         'aa9e36e721864e24c5c632b2fa463dac'
+         '4642ae1ab8ec5c864b1fa2cc8bf43a8a'
+         'a01ce4e39f309ffc10857c7c1e4a2ae8'
+         'a3fa433801b8c11f83e069fe9c80ea8b'
+         '64c41f016b9583277ec8403824ff81b7'
+         'b13a0b9c610ff071eac36331c938aba1'
+         'b0da19aa67c3305bd611c9f104efaa74'
+         '423142ec2a76ee031725587f9c299420'
+         'f5efb8153fa3d0b0fd71fe8604c7d626'
+         '670fbd9766654969db82363378608c0a'
+         '424b23ae0de84f4027e375223d945fe4'
+         '77a50b5fe0cc2f431f0124db402056c1'
+         '2491ad84a2065cd1477f1a6b34c2a46c'
+         'c646461b4341ed83b1a83426fc627a70'
+         '0e4e4f1d9a16eb6038709d82cf31227d'
+         '88b8eb6d0b7cec85cfbc54f2d6716f2d'
+         '179ae7c4217e062df0d8bd5171792e11')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 #_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
--- a/qt5-base/mingw-w64/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+++ b/qt5-base/mingw-w64/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
@ -18,5 +18,5 @@ index 39280de..e152b0d 100644
 +    win32:shared:LIBS_PRIVATE += -lfreetype
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0002-Fix-oci-config-test-on-windows.patch
+++ b/qt5-base/mingw-w64/0002-Fix-oci-config-test-on-windows.patch
@ -17,5 +17,5 @@ index 3ffda1d..39b6f3759 100644
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+++ b/qt5-base/mingw-w64/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
@ -21,5 +21,5 @@ index 43b55f0..de2c3ec 100755
     if compileTest unix/ipc_posix "ipc_posix" ; then
         QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0004-Fix-building-mysql-driver-under-mingw.patch
+++ b/qt5-base/mingw-w64/0004-Fix-building-mysql-driver-under-mingw.patch
@ -21,5 +21,5 @@ index 3cfb614..8b7063f 100644
         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0005-Support-ANGLE-switches-via-configure-shell-script.patch
+++ b/qt5-base/mingw-w64/0005-Support-ANGLE-switches-via-configure-shell-script.patch
@ -90,5 +90,5 @@ index f6cd0e5..17214a0 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0006-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64/0006-Use-external-ANGLE-library.patch
@ -94,5 +94,5 @@ index 71347dc..921c4d8 100644
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -23,5 +23,5 @@ index b13f258..8a9093f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0008-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0008-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 0846cb2..543e905 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0009-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -24,5 +24,5 @@ index 382b10c..3caad90 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0010-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0010-Prevent-debug-library-names-in-pkg-config-files.patch
@ -29,5 +29,5 @@ index a3f71ba..b4792fe 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-D-Bus.patch
@ -39,5 +39,5 @@ index fbeea61..8e73e9e 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0012-Adjust-win32-g-mkspecs-profile.patch
+++ b/qt5-base/mingw-w64/0012-Adjust-win32-g-mkspecs-profile.patch
@ -71,5 +71,5 @@ index c5f6353..db92487 100644
 +
 load(qt_config)
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0013-Fix-linking-against-external-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-external-harfbuzz.patch
@ -32,5 +32,5 @@ index 7443368..2932f05 100644
 +    else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz)
 }
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0014-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-static-pcre.patch
@ -23,5 +23,5 @@ index e7f86dd..63fc683 100644
 
 QT_BEGIN_NAMESPACE
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
@ -52,5 +52,5 @@ index b497765..d63a684 100644
 
 CONFIG += static
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch
@ -34,5 +34,5 @@ index c3ed27d..30d2114 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch
@ -31,5 +31,5 @@ index 46aca50..e763602 100644
 INSTALLS += target
 
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch
@ -21,5 +21,5 @@ index a431052..b97ff0a 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@ -22,5 +22,5 @@ index cffffdc..6445481 100644
             cmd_prefix = "LC_ALL=C"
             cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch
@ -76,5 +76,5 @@ index 543e905..456f21c 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch
@ -118,5 +118,5 @@ index b4792fe..edd7918 100644
 
     t << endl;
 -- 
-2.10.1
+2.10.2

--- a/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From bffbc47e284be9dfc24d2eae96713f6d3661a81c Mon Sep 17 00:00:00 2001
+From baadc36def778c99b33f68d2c840c176bb873d66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/25] Allow usage of static version with CMake
@ -7,18 +7,18 @@ Subject: [PATCH 22/25] Allow usage of static version with CMake
 - Allow selecting between dynamic and static Qt versions
  installed in the same prefix
  - Use eg. find_package(Qt5Core) for dynamic version
-  - and eg. find_package(StaticQt5Core) for dynamic version
+  - and eg. find_package(StaticQt5Core) for static version
 ---
- mkspecs/features/create_cmake.prf                  |  79 +++---
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 299 ++++++++++++++++-----
- .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 ++-
+ mkspecs/features/create_cmake.prf                  |  85 ++++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 338 +++++++++++++++------
+ .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
 qmake/generators/makefile.cpp                      |   7 +
 src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
 src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
- 6 files changed, 349 insertions(+), 115 deletions(-)
+ 6 files changed, 358 insertions(+), 151 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 0ff1c6d..7ed32df 100644
+index 0ff1c6d..d0d4a7f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,8 @@ split_incpath {
@ -31,7 +31,16 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += \
         cmake_extra_source_includes
-@@ -135,17 +136,19 @@ contains(CONFIG, plugin) {
+@@ -90,6 +91,8 @@ win32:!wince:!static:!staticlib {
+ }
+ 
+ static|staticlib:CMAKE_STATIC_TYPE = true
+static|staticlib:VAR_PREFIX = "Static"
+else:VAR_PREFIX = ""
+ 
+ CMAKE_DEBUG_TYPE =
+ CMAKE_RELEASE_TYPE =
+@@ -135,17 +138,19 @@ contains(CONFIG, plugin) {
     CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
 
     win32 {
@ -55,7 +64,7 @@ index 0ff1c6d..7ed32df 100644
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
             else: CMAKE_PlUGIN_EXT = .a
-@@ -161,13 +164,15 @@ contains(CONFIG, plugin) {
+@@ -161,13 +166,15 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -73,7 +82,7 @@ index 0ff1c6d..7ed32df 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -180,6 +185,8 @@ mod_deps =
+@@ -180,6 +187,8 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -82,10 +91,23 @@ index 0ff1c6d..7ed32df 100644
 # Until CMake 3.0 is the minimum requirement of Qt 5, we need to filter
 # out header-only modules from dependencies.  CMake 3.0 provides INTERFACE
 # libraries which are equivalent to header-only modules.
-@@ -197,10 +204,13 @@ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
+@@ -188,19 +197,26 @@ for (dep, sorted_deps) {
+     !contains(QT.$${dep}.module_config, no_link) {
+         mod_deps += $$cdep
+         lib_deps += Qt5::$$cdep
+        lib_deps_static += StaticQt5::$$cdep
+     } else {
+         aux_mod_deps += $$cdep
+         aux_lib_deps += Qt5::$$cdep
+        aux_lib_deps_static += StaticQt5::$$cdep
+     }
+ }
+ CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
 CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";")
+CMAKE_QT5_MODULE_DEPS_STATIC = $$join(lib_deps_static, ";")
 CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";")
 CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
+CMAKE_INTERFACE_QT5_MODULE_DEPS_STATIC = $$join(aux_lib_deps_static, ";")
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
 
@ -96,7 +118,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -228,35 +238,33 @@ mac {
+@@ -228,35 +244,33 @@ mac {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
@ -151,7 +173,7 @@ index 0ff1c6d..7ed32df 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -276,12 +284,14 @@ mac {
+@@ -276,12 +290,14 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -168,7 +190,7 @@ index 0ff1c6d..7ed32df 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -295,7 +305,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
+@@ -295,7 +311,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
 exists($$cmake_extras_file.input) {
 
     CMAKE_MODULE_EXTRAS = "true"
@ -178,7 +200,7 @@ index 0ff1c6d..7ed32df 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -307,7 +318,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -307,7 +324,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -188,7 +210,7 @@ index 0ff1c6d..7ed32df 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -315,7 +327,8 @@ exists($$cmake_macros_file.input) {
+@@ -315,7 +333,8 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -199,39 +221,36 @@ index 0ff1c6d..7ed32df 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358ca..e2c17be 100644
+index d2358ca..89575ef 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -37,13 +37,25 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES_STATIC Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+-
+-set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF // TEMPLATE != aux
 
 -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
 -    if(NOT EXISTS \"${file}\" )
+-        message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
+-   \\\"${file}\\\"
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static FILE)
 +!!ELSE
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
 +!!ENDIF
 +    if(NOT EXISTS \"${FILE}\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        message(FATAL_ERROR \"The imported target \\\"Qt5::static::$${CMAKE_MODULE_NAME}\\\" references the file
-+!!ELSE
-         message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
-   \\\"${file}\\\"
-+!!ENDIF
+        message(FATAL_ERROR \"The imported target \\\"$${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
 +   \\\"${FILE}\\\"
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -54,44 +66,99 @@ but not all the files it references.
+@@ -54,44 +57,91 @@ but not all the files it references.
     endif()
 endmacro()
 
@ -317,12 +336,9 @@ index d2358ca..e2c17be 100644
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
 +!!ENDIF
     if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+        set_target_properties(Qt5::static::$${CMAKE_MODULE_NAME} PROPERTIES
-+!!ELSE
-         set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+!!ENDIF
+        set_target_properties($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
@ -331,17 +347,58 @@ index d2358ca..e2c17be 100644
 !!ENDIF
 
 -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
+set(TARGET_NAME $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 
 +if(NOT TARGET ${TARGET_NAME})
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -138,7 +205,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,33 +149,33 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+     )
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -134,11 +184,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 !!ENDIF
 
     foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
@ -353,7 +410,7 @@ index d2358ca..e2c17be 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -147,7 +218,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -147,16 +201,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -365,14 +422,102 @@ index d2358ca..e2c17be 100644
         endforeach()
     endif()
 !!ENDIF
-@@ -223,81 +298,191 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+ 
+-    set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+-    set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
+ !!ENDIF // TEMPLATE != aux
+     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
+ 
+@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF
+ 
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+     endif()
+     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+-    if (Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
+         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT EXACT)
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-    set(Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\")
+ !!ENDIF // TEMPLATE != aux
+ 
+     foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES})
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            find_package(Qt5${_module_dep}
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            find_package($${VAR_PREFIX}Qt5${_module_dep}
+                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
+                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
+@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             )
+         endif()
+ 
+-        if (NOT Qt5${_module_dep}_FOUND)
+-            set(Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+        if (NOT $${VAR_PREFIX}Qt5${_module_dep}_FOUND)
+            set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+             return()
+         endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+-        list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
+        list(APPEND $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+ !!ENDIF // TEMPLATE != aux
+     endforeach()
+ !!IF !equals(TEMPLATE, aux)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+-    list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
+    list(REMOVE_DUPLICATES $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
+ !!ENDIF // TEMPLATE != aux
+ 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+    set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS_STATIC}\")
+!!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
+!!ENDIF
+ 
+ !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
+     if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
-+    add_library(Qt5::static::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+    add_library(StaticQt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
 +
 +    macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
 +        if (EXISTS \"${PRL_FILE_LOCATION}\")
@ -398,12 +543,12 @@ index d2358ca..e2c17be 100644
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC}\" RELEASE)
 +!!ENDIF
 +
@ -414,32 +559,26 @@ index d2358ca..e2c17be 100644
     add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
 !!ENDIF
 !!ENDIF
-+
-+!!IF !equals(TEMPLATE, aux)
-+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ELSE
-+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-+!!ENDIF
-+!!ENDIF
-+!!ENDIF // TEMPLATE != aux
 +
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 !!ENDIF
 !!ENDIF // TEMPLATE != aux
 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
-+!!ELSE
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+!!IF !equals(TEMPLATE, aux)
+!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
 +!!ENDIF
+!!ENDIF // TEMPLATE != aux
+
+    set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
 +    set(interface_compile_definitions $${MODULE_DEFINE})
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET Qt5::static::$${CMAKE_MODULE_NAME} PROPERTY
+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY
 +        INTERFACE_COMPILE_DEFINITIONS $${CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC} $${MODULE_DEFINE})
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ELSE
@ -452,11 +591,7 @@ index d2358ca..e2c17be 100644
 +    unset(pluginTargets)
 +    if(pluginTargetsMaybe)
 +        foreach(pluginTarget ${pluginTargetsMaybe})
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC)
-+!!ELSE
-+            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
-+!!ENDIF
+            file(STRINGS ${pluginTarget} matched REGEX $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
 +            if(matched)
 +                list(APPEND pluginTargets ${pluginTarget})
 +            endif()
@ -505,7 +640,7 @@ index d2358ca..e2c17be 100644
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 !!ELSE
 -    _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
@ -525,7 +660,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
 +    endif()
 +!!ELSE // CMAKE_STATIC_TYPE
     if (EXISTS
@ -575,12 +710,12 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
 -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(Qt5::static::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
+        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
 +!!ELSE
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +495,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -594,7 +729,7 @@ index d2358ca..e2c17be 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -323,37 +510,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -622,20 +757,14 @@ index d2358ca..e2c17be 100644
 -
 -
 !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
 !!ENDIF
 -
-+!!ENDIF
 !!IF !isEmpty(CMAKE_MODULE_MACROS)
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}Macros.cmake\")
-+!!ELSE
-     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
 !!ENDIF
-+!!ENDIF
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
 +_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
@ -645,7 +774,7 @@ index d2358ca..e2c17be 100644
 
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..a37e3bc 100644
+index 5baf0fd..54345e4 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,11 +1,31 @@
@ -653,8 +782,8 @@ index 5baf0fd..a37e3bc 100644
 -add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +# Some Qt modules also load plugin target in extra config, so check whether the target already exists
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+if(NOT TARGET Qt5::static::$$CMAKE_PLUGIN_NAME)
-+    add_library(Qt5::static::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+if(NOT TARGET StaticQt5::$$CMAKE_PLUGIN_NAME)
+    add_library(StaticQt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
 +!!ELSE
 +if(NOT TARGET Qt5::$$CMAKE_PLUGIN_NAME)
 +    add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
@ -663,7 +792,7 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!ENDIF
@ -671,14 +800,14 @@ index 5baf0fd..a37e3bc 100644
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(Qt5::static::$$CMAKE_MODULE_NAME Qt5::static::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
 +!!ENDIF
 +!!ENDIF
 +
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS_STATIC Qt5::static::$$CMAKE_PLUGIN_NAME)
+    list(APPEND StaticQt5$${CMAKE_MODULE_NAME}_PLUGINS StaticQt5::$$CMAKE_PLUGIN_NAME)
 +!!ELSE
 +    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 !!ENDIF
@ -704,13 +833,13 @@ index edd7918..9f860da 100644
 }
 
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index a5ed8b2..b730734 100644
+index a5ed8b2..3375e1e 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -803,13 +932,13 @@ index a5ed8b2..b730734 100644
 +unset(_isExe)
 +!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911..e3b6a0a 100644
+index 2e32911..31567d7 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -1,4 +1,10 @@
 
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME Qt5::static::$${CMAKE_MODULE_NAME})
+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
 +!!ELSE
 +set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
 +!!ENDIF
@ -839,5 +968,5 @@ index 2e32911..e3b6a0a 100644
         ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
     )
 -- 
-2.10.1
+2.10.2

--- a/Show More
+++ b/Show More