diff options
| author | Martchus | 2020-12-09 13:16:53 +0100 |
|---|---|---|
| committer | Martchus | 2020-12-09 13:16:53 +0100 |
| commit | e605c26e07d8eaab3715ac2c15f9fa9a0aed0861 (patch) | |
| tree | 2bec351d2ed2fa057933f83fcba71c3fa6970a37 /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | 64af81a17696dd1faacbb5b577c7303773c87b7e (diff) | |
| download | aur-e605c26e07d8eaab3715ac2c15f9fa9a0aed0861.tar.gz | |
Update to 6.0.0
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index bbce7829b919..394e2e9deabe 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 302744ea356871a22f9cb6819bf0a9baf0e8211c Mon Sep 17 00:00:00 2001 +From b3a78b8672134e97f6a6b511dd1c6822fe9811e8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 1/7] Use CMake's default import library suffix @@ -13,10 +13,10 @@ Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index 5fc0a5877b..5782de0f91 100644 +index e0f10d19bb..ae2fe6e8f3 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -330,9 +330,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -342,9 +342,13 @@ 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}") @@ -31,7 +31,7 @@ index 5fc0a5877b..5782de0f91 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( -@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined} +@@ -749,9 +753,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -47,10 +47,10 @@ index 5fc0a5877b..5782de0f91 100644 ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 35d321420c..40a85e6c73 100644 +index 0ad1747961..fcb520f2ad 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake -@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} +@@ -348,11 +348,17 @@ ${prl_step1_content_libs} CONTENT "FINAL_PRL_FILE_PATH = ${final_prl_file_path}") @@ -70,10 +70,10 @@ index 35d321420c..40a85e6c73 100644 if(QT_GENERATOR_IS_MULTI_CONFIG) set(configs ${CMAKE_CONFIGURATION_TYPES}) diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake -index fcbb3ab1f2..332ef6ee4c 100644 +index fe8d461856..74dfefcedc 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake -@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) +@@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) |