diff options
| author | Martchus | 2022-10-11 21:30:12 +0200 |
|---|---|---|
| committer | Martchus | 2022-10-11 21:30:12 +0200 |
| commit | e3ac3564110bfc4b5457c4675a32b1d5777711b1 (patch) | |
| tree | ee8d5b0fa48b10065b7ea9c0de370933b1c9108b /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | 90cec50392577d6160b8ca84f197af5a1858a870 (diff) | |
| download | aur-e3ac3564110bfc4b5457c4675a32b1d5777711b1.tar.gz | |
Update to 6.4.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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index d8d6b4cd1dbf..17abb767da90 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 c5188956b46429172946dcfebbe4878048579c6f Mon Sep 17 00:00:00 2001 +From 6a7960f983c4e21c0501fdfb7ee59acfe751f158 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,7 +13,7 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index 61080da7ef..173c6743ba 100644 +index 71164c6718..616f1f8ce1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features @@ -47,7 +47,7 @@ index 61080da7ef..173c6743ba 100644 ${CMAKE_STATIC_LIBRARY_SUFFIX}) if(MSVC) diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index c467e9a634..dda5c41266 100644 +index 298bc44c9b..6978fe25fc 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -121,11 +121,17 @@ ${prl_step1_content_libs} @@ -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 d9219ee529..b47190f5e6 100644 +index 7d3230594a..04683633b9 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -497,7 +497,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -522,7 +522,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 d9219ee529..b47190f5e6 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.36.1 +2.37.3 |