Update to 5.9.1

1 files changed, 234 insertions, 178 deletions

diff --git a/0023-Allow-usage-of-static-version-with-CMake.patch b/0023-Allow-usage-of-static-version-with-CMake.patch
index 2f79e89bbd96..b60a2d2d0528 100644
--- a/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/0023-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 884534d5a74833a3666e1d34a30a9ea600a92df4 Mon Sep 17 00:00:00 2001
+From c3a38331998e8007b7c9823306593f07abb72ca4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 23/31] Allow usage of static version with CMake
@@ -8,42 +8,46 @@ Subject: [PATCH 23/31] Allow usage of static version with CMake
   installed in the same prefix
   - Use eg. find_package(Qt5Core) for dynamic version
   - and eg. find_package(StaticQt5Core) for static version
+  - Static targets are prefixed, eg. StaticQt5::Core
+  - Set USE_STATIC_QT_BY_DEFAULT to use static version
+    via regular find_package(Qt5Core)
 
-Change-Id: Idf2d3ab8e3581910f59d9727ef6b48e105729463
+Change-Id: Ie635de801de7195dddf13b4f9c721c46aecbc8e2
 ---
- mkspecs/features/create_cmake.prf                  |  85 +++--
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 372 ++++++++++++++-------
- .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
+ mkspecs/features/create_cmake.prf                  | 103 ++++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 401 +++++++++++++++------
+ .../features/data/cmake/Qt5PluginTarget.cmake.in   |  21 +-
+ .../data/cmake/Qt5StaticOnlyRedirection.cmake.in   |  11 +
  qmake/generators/makefile.cpp                      |   7 +
- src/corelib/Qt5CoreConfigExtras.cmake.in           |  30 +-
- src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
- src/testlib/Qt5TestConfigExtras.cmake.in           |   4 +
- 7 files changed, 372 insertions(+), 168 deletions(-)
+ src/corelib/Qt5CoreConfigExtras.cmake.in           |  26 +-
+ src/gui/Qt5GuiConfigExtras.cmake.in                |   8 +-
+ src/testlib/Qt5TestConfigExtras.cmake.in           |   2 +-
+ 8 files changed, 405 insertions(+), 174 deletions(-)
+ create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 15fc070008..0914532f54 100644
+index 15fc070008..13bd362092 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -38,7 +38,8 @@ split_incpath {
+@@ -38,7 +38,7 @@ split_incpath {
              $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME})
  
      cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in
 -    cmake_extra_source_includes.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/ExtraSourceIncludes.cmake
-+    isEmpty(CMAKE_STATIC_TYPE): cmake_extra_source_includes.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/ExtraSourceIncludes.cmake
-+    else: cmake_extra_source_includes.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/ExtraSourceIncludes.cmake
++    cmake_extra_source_includes.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/ExtraSourceIncludes.cmake
  
      !build_pass:QMAKE_SUBSTITUTES += \
          cmake_extra_source_includes
-@@ -90,6 +91,8 @@ win32:!static:!staticlib {
+@@ -90,6 +90,8 @@ win32:!static:!staticlib {
  }
  
  static|staticlib:CMAKE_STATIC_TYPE = true
-+static|staticlib:VAR_PREFIX = "Static"
-+else:VAR_PREFIX = ""
++static|staticlib:DEFAULT_QT_VARIANT_PREFIX = "Static"
++else:DEFAULT_QT_VARIANT_PREFIX = ""
  
  CMAKE_DEBUG_TYPE =
  CMAKE_RELEASE_TYPE =
-@@ -135,17 +138,19 @@ contains(CONFIG, plugin) {
+@@ -135,17 +137,19 @@ contains(CONFIG, plugin) {
      CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
  
      win32 {
@@ -67,25 +71,23 @@ index 15fc070008..0914532f54 100644
          mac {
              isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
              else: CMAKE_PlUGIN_EXT = .a
-@@ -161,13 +166,15 @@ contains(CONFIG, plugin) {
+@@ -161,13 +165,13 @@ contains(CONFIG, plugin) {
          }
      }
      cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
 -    cmake_target_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}_$${PLUGIN_CLASS_NAME}.cmake
-+    isEmpty(CMAKE_STATIC_TYPE): cmake_target_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}_$${PLUGIN_CLASS_NAME}.cmake
-+    else: cmake_target_file.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/StaticQt5$${CMAKE_MODULE_NAME}_$${PLUGIN_CLASS_NAME}.cmake
++    cmake_target_file.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_$${PLUGIN_CLASS_NAME}.cmake
  
      !build_pass:QMAKE_SUBSTITUTES += \
        cmake_target_file
  
      cmake_qt5_plugin_file.files = $$cmake_target_file.output
 -    cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+    isEmpty(CMAKE_STATIC_TYPE): cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+    else: cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/StaticQt5$${CMAKE_MODULE_NAME}
++    cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -180,6 +187,8 @@ mod_deps =
+@@ -180,27 +184,36 @@ mod_deps =
  lib_deps =
  aux_mod_deps =
  aux_lib_deps =
@@ -94,15 +96,20 @@ index 15fc070008..0914532f54 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.
-@@ -188,19 +197,26 @@ for (dep, sorted_deps) {
+ for (dep, sorted_deps) {
+     cdep = $$cmakeModuleName($$dep)
      !contains(QT.$${dep}.module_config, no_link) {
-         mod_deps += $$cdep
-         lib_deps += Qt5::$$cdep
-+        lib_deps_static += StaticQt5::$$cdep
+-        mod_deps += $$cdep
+-        lib_deps += Qt5::$$cdep
++        mod_deps += "$$cdep"
++        lib_deps += "${QT_VARIANT_PREFIX}Qt5::$$cdep"
++        lib_deps_static += "${QT_VARIANT_PREFIX}Qt5::$$cdep"
      } else {
-         aux_mod_deps += $$cdep
-         aux_lib_deps += Qt5::$$cdep
-+        aux_lib_deps_static += StaticQt5::$$cdep
+-        aux_mod_deps += $$cdep
+-        aux_lib_deps += Qt5::$$cdep
++        aux_mod_deps += "$$cdep"
++        aux_lib_deps += "${QT_VARIANT_PREFIX}Qt5::$$cdep"
++        aux_lib_deps_static += "${QT_VARIANT_PREFIX}Qt5::$$cdep"
      }
  }
  CMAKE_MODULE_DEPS = $$join(mod_deps, ";")
@@ -121,7 +128,7 @@ index 15fc070008..0914532f54 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 +244,33 @@ mac {
+@@ -228,35 +241,33 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
  
@@ -176,66 +183,116 @@ index 15fc070008..0914532f54 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 +290,14 @@ mac {
+@@ -276,12 +287,12 @@ mac {
  INSTALLS += cmake_qt5_module_files
  
  cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
 -cmake_config_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake
-+isEmpty(CMAKE_STATIC_TYPE): cmake_config_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake
-+else: cmake_config_file.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/StaticQt5$${CMAKE_MODULE_NAME}Config.cmake
++cmake_config_file.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}Config.cmake
  
  CMAKE_PACKAGE_VERSION = $$eval(QT.$${MODULE}.VERSION)
  
  cmake_config_version_file.input = $$PWD/data/cmake/Qt5ConfigVersion.cmake.in
 -cmake_config_version_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake
-+isEmpty(CMAKE_STATIC_TYPE): cmake_config_version_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake
-+else: cmake_config_version_file.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake
++cmake_config_version_file.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake
  
  !build_pass:QMAKE_SUBSTITUTES += \
      cmake_config_file \
-@@ -295,7 +311,8 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.
+@@ -291,11 +302,29 @@ cmake_qt5_module_files.files = \
+     $$cmake_config_file.output \
+     $$cmake_config_version_file.output
+ 
++# add regular CMake package for static-only modules
++static|staticlib:actually_a_shared_build {
++    INSTALLS += cmake_qt5_module_files_shared
++
++    cmake_config_file_shared.input = $$PWD/data/cmake/Qt5StaticOnlyRedirection.cmake.in
++    cmake_config_file_shared.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake
++    cmake_config_version_file_shared.input = $$PWD/data/cmake/Qt5ConfigVersion.cmake.in
++    cmake_config_version_file_shared.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake
++    !build_pass:QMAKE_SUBSTITUTES += \
++        cmake_config_file_shared \
++        cmake_config_version_file_shared
++
++    cmake_qt5_module_files_shared.files = \
++        $$cmake_config_file_shared.output \
++        $$cmake_config_version_file_shared.output
++    cmake_qt5_module_files_shared.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
++}
++
+ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake.in
  exists($$cmake_extras_file.input) {
  
      CMAKE_MODULE_EXTRAS = "true"
 -    cmake_extras_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake
-+    isEmpty(CMAKE_STATIC_TYPE): cmake_extras_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake
-+    else: cmake_extras_file.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/StaticQt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake
++    cmake_extras_file.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
  
-@@ -307,7 +324,8 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -307,7 +336,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
  exists($$cmake_macros_file.input) {
      CMAKE_MODULE_MACROS = "true"
  
 -    cmake_macros_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
-+    isEmpty(CMAKE_STATIC_TYPE): cmake_macros_file.output = $$CMAKE_OUT_DIR/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
-+    else: cmake_macros_file.output = $$CMAKE_OUT_DIR/StaticQt5$${CMAKE_MODULE_NAME}/StaticQt5$${CMAKE_MODULE_NAME}Macros.cmake
++    cmake_macros_file.output = $$CMAKE_OUT_DIR/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake
      cmake_macros_file.CONFIG = verbatim
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -315,7 +333,8 @@ exists($$cmake_macros_file.input) {
+@@ -315,7 +344,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
 -cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+isEmpty(CMAKE_STATIC_TYPE): cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+else: cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/StaticQt5$${CMAKE_MODULE_NAME}
++cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/$${DEFAULT_QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}
  
  # 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 4f342d67d7..908f7f59a7 100644
+index 17da8b979e..ec5e873aa1 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+@@ -9,6 +9,32 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+ endif()
+ !!ENDIF
+ 
++!!IF isEmpty(CMAKE_STATIC_TYPE)
++# "redirect" to static package overriding variant prefix so it does not contain "Static" anymore
++if(USE_STATIC_QT_BY_DEFAULT)
++    set(ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX "${OVERRIDE_QT_VARIANT_PREFIX}")
++    if(OVERRIDE_QT_VARIANT_PREFIX)
++        string(REPLACE \"Static\" \"\" OVERRIDE_QT_VARIANT_PREFIX "${OVERRIDE_QT_VARIANT_PREFIX}")
++    endif()
++    if(NOT OVERRIDE_QT_VARIANT_PREFIX)
++        set(OVERRIDE_QT_VARIANT_PREFIX "none")
++    endif()
++    find_package(StaticQt5$${CMAKE_MODULE_NAME})
++    set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
++    return()
++endif()
++!!ENDIF
++
++if(OVERRIDE_QT_VARIANT_PREFIX)
++    if(OVERRIDE_QT_VARIANT_PREFIX STREQUAL "none")
++        unset(QT_VARIANT_PREFIX)
++    else()
++        set(QT_VARIANT_PREFIX "${OVERRIDE_QT_VARIANT_PREFIX}")
++    endif()
++else()
++    set(QT_VARIANT_PREFIX \"$${DEFAULT_QT_VARIANT_PREFIX}\")
++endif()
++
+ !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+ !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+@@ -35,15 +61,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
  
  !!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}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
++set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.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})
++set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
  !!ENDIF // TEMPLATE != aux
  
 -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
@@ -248,12 +305,12 @@ index 4f342d67d7..908f7f59a7 100644
 +macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
 +!!ENDIF
 +    if(NOT EXISTS \"${FILE}\")
-+        message(FATAL_ERROR \"The imported target \\\"$${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
++        message(FATAL_ERROR \"The imported target \\\"${QT_VARIANT_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 +57,91 @@ but not all the files it references.
+@@ -54,44 +84,91 @@ but not all the files it references.
      endif()
  endmacro()
  
@@ -341,7 +398,7 @@ index 4f342d67d7..908f7f59a7 100644
      if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
 -        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+        set_target_properties($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
++        set_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
          )
      endif()
@@ -350,18 +407,18 @@ index 4f342d67d7..908f7f59a7 100644
  !!ENDIF
  
 -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-+set(TARGET_NAME $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
++set(TARGET_NAME ${QT_VARIANT_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
-@@ -99,46 +149,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,46 +176,50 @@ 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
++    set(${QT_VARIANT_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}\"
      )
@@ -370,14 +427,14 @@ index 4f342d67d7..908f7f59a7 100644
 -!!ENDIF
 -!!ELSE
 +!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 +!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
 +!!ELSE // !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
  !!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
++    set(${QT_VARIANT_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}\"
      )
@@ -386,13 +443,13 @@ index 4f342d67d7..908f7f59a7 100644
 -!!ENDIF
 -!!ELSE
 +!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 +!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
 +!!ELSE // isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
      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
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
          \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
          \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
      )
@@ -402,7 +459,7 @@ index 4f342d67d7..908f7f59a7 100644
 -!!ENDIF
 -!!ENDIF
 +!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
 +!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
 +!!ENDIF // isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
 +!!ENDIF // !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
@@ -412,7 +469,7 @@ index 4f342d67d7..908f7f59a7 100644
  !!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 \"\")
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
  !!ENDIF
  
      foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
@@ -424,7 +481,7 @@ index 4f342d67d7..908f7f59a7 100644
      endforeach()
  
  !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -147,16 +201,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -147,16 +228,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})
@@ -439,58 +496,58 @@ index 4f342d67d7..908f7f59a7 100644
  
  !!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(${QT_VARIANT_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})
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINE})
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -166,10 +224,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -166,10 +251,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endif()
  !!ENDIF
  
 -    set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
-+    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
++    set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
  
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
 -    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
-+    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
++    if (${QT_VARIANT_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)
-@@ -177,17 +235,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -177,17 +262,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)
++    if (${QT_VARIANT_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 \"\")
++    set(${QT_VARIANT_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}
++        if (NOT ${QT_VARIANT_PREFIX}Qt5${_module_dep}_FOUND)
++            find_package(${QT_VARIANT_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}
-@@ -195,28 +253,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -195,28 +280,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)
++        if (NOT ${QT_VARIANT_PREFIX}Qt5${_module_dep}_FOUND)
++            set(${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FOUND False)
              return()
          endif()
  
@@ -500,11 +557,11 @@ index 4f342d67d7..908f7f59a7 100644
 -        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})
++        list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\")
++        list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\")
++        list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
++        list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
++        list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
  !!ENDIF // TEMPLATE != aux
      endforeach()
  !!IF !equals(TEMPLATE, aux)
@@ -513,11 +570,11 @@ index 4f342d67d7..908f7f59a7 100644
 -    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)
++    list(REMOVE_DUPLICATES ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
++    list(REMOVE_DUPLICATES ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++    list(REMOVE_DUPLICATES ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
++    list(REMOVE_DUPLICATES ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
++    list(REMOVE_DUPLICATES ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
  !!ENDIF // TEMPLATE != aux
  
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -528,14 +585,14 @@ index 4f342d67d7..908f7f59a7 100644
  
  !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
      if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-@@ -225,28 +287,124 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -225,28 +314,124 @@ 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(StaticQt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
-+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
++    add_library(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
 +
 +    macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
 +        if (EXISTS \"${PRL_FILE_LOCATION}\")
@@ -561,12 +618,12 @@ index 4f342d67d7..908f7f59a7 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
 +
@@ -578,38 +635,39 @@ index 4f342d67d7..908f7f59a7 100644
  !!ENDIF
  !!ENDIF
 +
++!!IF !equals(TEMPLATE, aux)
++!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
++!!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 $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
  !!ENDIF
  !!ENDIF // TEMPLATE != aux
  
 -    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
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
        INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+-    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
+-      INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINE})
 +    set(interface_compile_definitions $${MODULE_DEFINE})
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    set_property(TARGET StaticQt5::$${CMAKE_MODULE_NAME} PROPERTY
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${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\")
++    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ELSE
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
--      INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINE})
++    set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY
 +        INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINE})
-+    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
++    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
 +!!ENDIF
 +
 +    unset(pluginTargets)
 +    if(pluginTargetsMaybe)
 +        foreach(pluginTarget ${pluginTargetsMaybe})
-+            file(STRINGS ${pluginTarget} matched REGEX $${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
++            file(STRINGS ${pluginTarget} matched REGEX Qt5$${CMAKE_MODULE_NAME}_PLUGINS)
 +            if(matched)
 +                list(APPEND pluginTargets ${pluginTarget})
 +            endif()
@@ -655,31 +713,31 @@ index 4f342d67d7..908f7f59a7 100644
  
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
 -    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
-+    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
++    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
          if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
              set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
          endif()
-@@ -254,9 +412,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -254,9 +439,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
      if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
          AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
 -        add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 -            INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
-+        add_library($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
-+        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
-+            INTERFACE_INCLUDE_DIRECTORIES ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
++        add_library(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
++        set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_INCLUDE_DIRECTORIES ${${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
          )
          set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
          foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -264,66 +422,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -264,66 +449,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 -            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
-+        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
-+            INTERFACE_LINK_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
++        set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
          )
      endif()
  
@@ -688,11 +746,11 @@ index 4f342d67d7..908f7f59a7 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(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
++    _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${QT_VARIANT_PREFIX}Qt5::$${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
-+    _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
++    _populate_$${CMAKE_MODULE_NAME}_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 +!!ENDIF // CMAKE_STATIC_TYPE
 +
  
@@ -708,7 +766,7 @@ index 4f342d67d7..908f7f59a7 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(StaticQt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
++        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" )
 +    endif()
 +!!ELSE // CMAKE_STATIC_TYPE
      if (EXISTS
@@ -726,7 +784,7 @@ index 4f342d67d7..908f7f59a7 100644
  !!ENDIF
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
++        _populate_$${CMAKE_MODULE_NAME}_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
      endif()
 +!!ENDIF // CMAKE_STATIC_TYPE
  !!ENDIF // CMAKE_DEBUG_TYPE
@@ -758,18 +816,18 @@ index 4f342d67d7..908f7f59a7 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(StaticQt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
-+!!ELSE
++        _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" )
++!!ELSE // CMAKE_STATIC_TYPE
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -336,9 +496,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,9 +523,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
 -        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
++        _populate_$${CMAKE_MODULE_NAME}_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
      endif()
 +!!ENDIF // CMAKE_STATIC_TYPE
 +
@@ -777,7 +835,7 @@ index 4f342d67d7..908f7f59a7 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -349,37 +511,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -349,37 +538,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -806,64 +864,73 @@ index 4f342d67d7..908f7f59a7 100644
 -
  !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
 -    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
++    include(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
  !!ENDIF
 -
  !!IF !isEmpty(CMAKE_MODULE_MACROS)
 -    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
-+    include(\"${CMAKE_CURRENT_LIST_DIR}/$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
++    include(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
  !!ENDIF
  
+-_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
 +!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/StaticQt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
++_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
 +!!ELSE
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
++_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
 +!!ENDIF
  
  endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fdb10..54345e4117 100644
+index 5baf0fdb10..1e4d98086c 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -1,11 +1,31 @@
+@@ -1,11 +1,22 @@
 -
 -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 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)
-+!!ENDIF
++if(NOT TARGET ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME)
++    add_library(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
  
  !!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(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$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}\")
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
 +!!ENDIF
  !!ENDIF
  !!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(StaticQt5::$$CMAKE_MODULE_NAME StaticQt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG_STATIC}\")
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$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
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
 +!!ENDIF
 +
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    list(APPEND StaticQt5$${CMAKE_MODULE_NAME}_PLUGINS StaticQt5::$$CMAKE_PLUGIN_NAME)
-+!!ELSE
-+    list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
- !!ENDIF
++list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME)
  
 -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 +endif()
+diff --git a/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
+new file mode 100644
+index 0000000000..0091940fd2
+--- /dev/null
++++ b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
+@@ -0,0 +1,11 @@
++# "redirect" to static package overriding variant prefix so it does not contain "Static" anymore
++set(ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX "${OVERRIDE_QT_VARIANT_PREFIX}")
++if(OVERRIDE_QT_VARIANT_PREFIX)
++    string(REPLACE \"Static\" \"\" OVERRIDE_QT_VARIANT_PREFIX "${OVERRIDE_QT_VARIANT_PREFIX}")
++endif()
++if(NOT OVERRIDE_QT_VARIANT_PREFIX)
++    set(OVERRIDE_QT_VARIANT_PREFIX "none")
++endif()
++find_package(StaticQt5$${CMAKE_MODULE_NAME})
++set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
++
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 990d10a286..35cb7d927a 100644
+index d61f7b05e5..2dd26bf4dd 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -881,21 +948,17 @@ index 990d10a286..35cb7d927a 100644
  }
  
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..42a3c557aa 100644
+index 545b9a3d1e..ebe6644dfe 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -1,4 +1,10 @@
+@@ -1,4 +1,6 @@
  
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
++set(IMPORTED_TARGET_NAME ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 +
  if (NOT TARGET Qt5::qmake)
      add_executable(Qt5::qmake IMPORTED)
  
-@@ -50,9 +56,9 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
+@@ -50,9 +52,9 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
  set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
  set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
  
@@ -908,7 +971,7 @@ index 545b9a3d1e..42a3c557aa 100644
    COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE
  )
  
-@@ -63,7 +69,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
+@@ -63,7 +65,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
  endforeach()
  
  list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
@@ -917,7 +980,7 @@ index 545b9a3d1e..42a3c557aa 100644
  set(_qt5_corelib_extra_includes)
  
  # Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
-@@ -81,9 +87,9 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
+@@ -81,9 +83,9 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
  if (CMAKE_VERSION VERSION_LESS 2.8.12
          AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
          OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
@@ -929,7 +992,7 @@ index 545b9a3d1e..42a3c557aa 100644
  endif()
  
  # Applications using qmake or cmake >= 2.8.12 as their build system will
-@@ -103,7 +109,7 @@ endif()
+@@ -103,7 +105,7 @@ endif()
  !!IF !isEmpty(QT_NAMESPACE)
  list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
  list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
@@ -938,7 +1001,7 @@ index 545b9a3d1e..42a3c557aa 100644
  !!ENDIF
  
  !!IF !isEmpty(CMAKE_DISABLED_FEATURES)
-@@ -112,9 +118,9 @@ set(Qt5_DISABLED_FEATURES
+@@ -112,9 +114,9 @@ set(Qt5_DISABLED_FEATURES
  )
  !!ENDIF
  
@@ -950,7 +1013,7 @@ index 545b9a3d1e..42a3c557aa 100644
  
  !!IF qtConfig(reduce_exports)
  set(QT_VISIBILITY_AVAILABLE \"True\")
-@@ -162,14 +168,14 @@ if (NOT TARGET Qt5::WinMain)
+@@ -162,14 +164,14 @@ if (NOT TARGET Qt5::WinMain)
          set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
          set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
          set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
@@ -969,21 +1032,17 @@ index 545b9a3d1e..42a3c557aa 100644
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911a64..31567d7da2 100644
+index 2e32911a64..6b02a12944 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -1,4 +1,10 @@
+@@ -1,4 +1,6 @@
  
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set(IMPORTED_TARGET_NAME StaticQt5::$${CMAKE_MODULE_NAME})
-+!!ELSE
-+set(IMPORTED_TARGET_NAME Qt5::$${CMAKE_MODULE_NAME})
-+!!ENDIF
++set(IMPORTED_TARGET_NAME ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME})
 +
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
  !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-@@ -67,7 +73,7 @@ unset(_GL_INCDIRS)
+@@ -67,7 +69,7 @@ unset(_GL_INCDIRS)
  # optional.
  
  list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
@@ -992,7 +1051,7 @@ index 2e32911a64..31567d7da2 100644
  
  unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
  
-@@ -170,9 +176,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
+@@ -170,9 +172,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
  
  set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
  
@@ -1005,19 +1064,16 @@ index 2e32911a64..31567d7da2 100644
          ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
      )
 diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in
-index 2a575958ae..8312c90fd1 100644
+index 2a575958ae..ca0e3be3b5 100644
 --- a/src/testlib/Qt5TestConfigExtras.cmake.in
 +++ b/src/testlib/Qt5TestConfigExtras.cmake.in
-@@ -1,5 +1,9 @@
+@@ -1,5 +1,5 @@
  
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+set_property(TARGET StaticQt5::Test
-+!!ELSE
- set_property(TARGET Qt5::Test
-+!!ENDIF
+-set_property(TARGET Qt5::Test
++set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::Test
    APPEND PROPERTY
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.13.0
+2.13.2