diff options
| author | Martchus | 2023-04-05 10:47:51 +0200 |
|---|---|---|
| committer | Martchus | 2023-04-05 10:47:51 +0200 |
| commit | 0bbfae6ea901e9ac098c9cdc1d40e84517f83537 (patch) | |
| tree | c1d5007f76ab9e8d3d07f483670bc5e7804e53c1 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | a3b34ba455376be4695ec6ce4f4c510b4b731062 (diff) | |
| download | aur-0bbfae6ea901e9ac098c9cdc1d40e84517f83537.tar.gz | |
Update to 6.5.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 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index f3b90da855a8..7cb03396e019 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 089202508f01a9663a2d184ed49a4970032eaeea Mon Sep 17 00:00:00 2001 +From c8094f63d266880d6137acc3d5a2995b65dd81c5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 01/12] 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 b8c238c203..431c9b44db 100644 +index c619a50f30..903c49133e 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -518,9 +518,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 b8c238c203..431c9b44db 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) if(MSVC) -@@ -939,9 +943,13 @@ CONFIG += ${private_config_joined} +@@ -971,9 +975,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -47,10 +47,10 @@ index b8c238c203..431c9b44db 100644 ${CMAKE_STATIC_LIBRARY_SUFFIX}) if(MSVC) diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 298bc44c9b..6978fe25fc 100644 +index 45bfaedcdf..a433c98fe8 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake -@@ -121,11 +121,17 @@ ${prl_step1_content_libs} +@@ -123,11 +123,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 ccfba93899..7fc87a8403 100644 +index 18576eead0..21b66c64e5 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -520,7 +520,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -524,7 +524,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) @@ -110,5 +110,5 @@ index ccfba93899..7fc87a8403 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.39.2 +2.40.0 |