Update to 6.1.0

1 files changed, 21 insertions, 22 deletions

diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index 8590e0296c93..928c832d23f9 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,22 +1,22 @@
-From 450fa18bf971462b62ddcf4d2166b4b4d8b821e3 Mon Sep 17 00:00:00 2001
+From 4bc7d8f91f0f3695ff167bf9617510942097c82a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 1/7] Use CMake's default import library suffix
+Subject: [PATCH 1/8] Use CMake's default import library suffix
 
-Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
+Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
  cmake/QtPriHelpers.cmake          | 12 ++++++++++--
  cmake/QtPrlHelpers.cmake          |  8 +++++++-
- cmake/QtTargetHelpers.cmake       |  2 --
  mkspecs/common/g++-win32.conf     |  1 +
  mkspecs/features/create_cmake.prf |  5 +++--
- 5 files changed, 21 insertions(+), 7 deletions(-)
+ src/corelib/Qt6CoreMacros.cmake   |  1 -
+ 5 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index e77e98fe76..35639684a4 100644
+index 5498b8a904..59c905eac2 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -368,9 +368,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -370,9 +370,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
  
@@ -31,7 +31,7 @@ index e77e98fe76..35639684a4 100644
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          add_custom_command(
-@@ -775,9 +779,13 @@ CONFIG += ${private_config_joined}
+@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
  
@@ -69,19 +69,6 @@ index 0c0b7a2aec..d408245ffc 100644
  
      if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index 2a0a22f682..90d40e30c5 100644
---- a/cmake/QtTargetHelpers.cmake
-+++ b/cmake/QtTargetHelpers.cmake
-@@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
- 
-         # This should cover both MINGW with GCC and CLANG.
-         if(NOT MSVC)
--            set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a")
--
-             get_target_property(target_type ${target} TYPE)
-             if(target_type STREQUAL "STATIC_LIBRARY")
-                 set_property(TARGET "${target}" PROPERTY PREFIX "lib")
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
 index 67ad1e3b8c..b98c7121f6 100644
 --- a/mkspecs/common/g++-win32.conf
@@ -110,6 +97,18 @@ index 24ed125f12..73ebe453d3 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
+diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
+index 3d1a10ff0a..a6935875c7 100644
+--- a/src/corelib/Qt6CoreMacros.cmake
++++ b/src/corelib/Qt6CoreMacros.cmake
+@@ -447,7 +447,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
+ 
+         # This should cover both MINGW with GCC and CLANG.
+         if(NOT MSVC)
+-            set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a")
+ 
+             get_target_property(target_type ${target} TYPE)
+             if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.30.0
+2.31.1