diff options
| author | Martchus | 2023-07-20 23:11:52 +0200 |
|---|---|---|
| committer | Martchus | 2023-07-20 23:11:52 +0200 |
| commit | b464a4c0aa45026779dd7e1e5dd188bece3d5e26 (patch) | |
| tree | c5973a0694cebc0e89e54b5e6c01fd8bea595827 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | dbe8507b17bfc1a4212c1e50b20d1002840b3ff9 (diff) | |
| download | aur-b464a4c0aa45026779dd7e1e5dd188bece3d5e26.tar.gz | |
Update to 6.5.2
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 d0066412dc88..4d81fb9593fd 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 7686993d2f493019692d560c29af10da8543f136 Mon Sep 17 00:00:00 2001 +From e9ac5ed92f5bb2fe3b6c8cf03871fc18731e562b 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,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 383870061b..b252e76ae5 100644 +index d50ec5257a..44a173b5bc 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -524,7 +524,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) @@ -110,5 +110,5 @@ index 383870061b..b252e76ae5 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.40.1 +2.41.0 |