diff options
| author | Martchus | 2021-10-02 12:37:19 +0200 |
|---|---|---|
| committer | Martchus | 2021-10-02 12:37:19 +0200 |
| commit | fe505c2c92c74816f59638d765779412b0d775f8 (patch) | |
| tree | c1e5ac643b71438d37304f3c1ba2f8420db3f893 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | 09f01e9025a3bb12e98ff0ba50996657bf453eca (diff) | |
| download | aur-fe505c2c92c74816f59638d765779412b0d775f8.tar.gz | |
Update to 6.2.0
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 6a1f3aeaa10a..cdbebd61f774 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,4 +1,4 @@ -From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 Mon Sep 17 00:00:00 2001 +From c704940ba6a38f36b40fa021764ff45ccf37151c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 1/8] Use CMake's default import library suffix @@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index 5498b8a904..59c905eac2 100644 +index ed6513133f..2d8de2011b 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -370,9 +370,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -401,9 +401,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}") @@ -30,8 +30,8 @@ index 5498b8a904..59c905eac2 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) - add_custom_command( -@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined} + if(MSVC) +@@ -828,9 +832,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -45,12 +45,12 @@ index 5498b8a904..59c905eac2 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) - add_custom_command( + if(MSVC) diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 0aab301053..f2e39b63e0 100644 +index 18b230deb1..1bb4908898 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake -@@ -348,11 +348,17 @@ ${prl_step1_content_libs} +@@ -120,11 +120,17 @@ ${prl_step1_content_libs} CONTENT "FINAL_PRL_FILE_PATH = ${final_prl_file_path}") @@ -98,10 +98,10 @@ index 24ed125f12..73ebe453d3 100644 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 fc4c745c90..939ea2b212 100644 +index 51fa960c5b..8ccb7dc9c4 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -460,7 +460,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) |