diff options
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 25da7a7f04b1..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 d497d34c8ee77ae39c05fdb8726751f604f191a0 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 @@ -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 9e0cd1fc66..56ca69a911 100644 +index 7d3230594a..04683633b9 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -509,7 +509,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) |