diff options
| author | Martchus | 2022-11-17 10:43:15 +0100 |
|---|---|---|
| committer | Martchus | 2022-11-17 10:43:15 +0100 |
| commit | c3d1faca7ce188f53668b968d3e37f40d310d039 (patch) | |
| tree | 2668ea4306f36d5645f50040cef14cf4a51a0d94 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | e3ac3564110bfc4b5457c4675a32b1d5777711b1 (diff) | |
| download | aur-c3d1faca7ce188f53668b968d3e37f40d310d039.tar.gz | |
Update to 6.4.1
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 17abb767da90..726bdd6599ca 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 6a7960f983c4e21c0501fdfb7ee59acfe751f158 Mon Sep 17 00:00:00 2001 +From cf97dadc21061c150c4cc813255b30f9f1d0aea0 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 @@ -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 7d3230594a..04683633b9 100644 +index cd8c951482..b494335efa 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -522,7 +522,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -520,7 +520,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 7d3230594a..04683633b9 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.37.3 +2.38.1 |