diff options
| author | Martchus | 2020-10-28 14:54:12 +0100 |
|---|---|---|
| committer | Marius Kittler | 2020-10-28 14:54:12 +0100 |
| commit | d5fc9b0d53496e209bc12bd0f547f62abdb213a7 (patch) | |
| tree | 6b82d316801709de3ffb5900e1980b36512eb349 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | 67d3138d6f73e52fdc191ca7db5256e44d4a815e (diff) | |
| download | aur-d5fc9b0d53496e209bc12bd0f547f62abdb213a7.tar.gz | |
Update to beta2
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 779576aad1d2..77356be11aee 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,7 +1,7 @@ -From b9fa200e7404db3edae936f7975526b78bad556a Mon Sep 17 00:00:00 2001 +From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 14 Sep 2020 20:39:52 +0200 -Subject: [PATCH 1/3] Use CMake's default import library suffix +Subject: [PATCH 1/2] Use CMake's default import library suffix Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd --- @@ -13,10 +13,10 @@ Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index 007acc95dd..8dd7ca63d2 100644 +index b79f17243e..a689b2b775 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -293,11 +293,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -292,11 +292,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") list(APPEND pri_files "${private_pri_file_path}") @@ -36,10 +36,10 @@ index 007acc95dd..8dd7ca63d2 100644 OUTPUT "${private_pri_file_path}" DEPENDS ${inputs} diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 7977afd030..7488d5f959 100644 +index 932565f318..9729c150a4 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake -@@ -248,11 +248,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} +@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} CONTENT "FINAL_PRL_FILE_PATH = ${final_prl_file_path}") @@ -59,10 +59,10 @@ index 7977afd030..7488d5f959 100644 if(QT_GENERATOR_IS_MULTI_CONFIG) set(configs ${CMAKE_CONFIGURATION_TYPES}) diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake -index dd23e8c95b..2213b04cd7 100644 +index fcbb3ab1f2..332ef6ee4c 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake -@@ -274,8 +274,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) +@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) @@ -72,7 +72,7 @@ index dd23e8c95b..2213b04cd7 100644 if(target_type STREQUAL "STATIC_LIBRARY") set_property(TARGET "${target}" PROPERTY PREFIX "lib") diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index a1e08ed63b..9f3ae47108 100644 +index 67ad1e3b8c..b98c7121f6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB = @@ -100,5 +100,5 @@ index 24ed125f12..73ebe453d3 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib -- -2.28.0 +2.29.1 |