diff options
| author | Martchus | 2022-03-20 12:10:34 +0100 |
|---|---|---|
| committer | Martchus | 2022-03-20 12:10:34 +0100 |
| commit | f7f312707dfb0dd46a8c9ad76267847aeb39547e (patch) | |
| tree | e067716b6ab8e3f252255bd57966e3a5c3ae76f7 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | c15178b7620555f7dbced338a5d2122dbc1c6a6e (diff) | |
| download | aur-f7f312707dfb0dd46a8c9ad76267847aeb39547e.tar.gz | |
Update to 6.2.4
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index b258d1f59079..6a8d16a3fa69 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 9df2dbd52b07e1964c3949c2b63970cf304c3bc7 Mon Sep 17 00:00:00 2001 +From 891c21a58a3ae6b649d54feb81c1bed15cbd768c 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 @@ -98,7 +98,7 @@ 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 5741e05bf7..39e4b2bd9e 100644 +index ba1bf5c28c..7777364536 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) @@ -110,5 +110,5 @@ index 5741e05bf7..39e4b2bd9e 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.35.0 +2.35.1 |