diff options
| author | Martchus | 2020-09-13 13:30:56 +0200 |
|---|---|---|
| committer | Martchus | 2020-09-13 13:30:56 +0200 |
| commit | 6d17f19b24ea4dc27d6be759bafbcce8b54bd012 (patch) | |
| tree | a6687000ddf8b79e31a21f9c55ecd17b651edf28 /0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | |
| parent | 8598b5e1679cfdd50942e06d32dee06292b579b5 (diff) | |
| download | aur-6d17f19b24ea4dc27d6be759bafbcce8b54bd012.tar.gz | |
Update to 5.15.1
Diffstat (limited to '0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch')
| -rw-r--r-- | 0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index b062b0c3eddb..1931672ccaf6 100644 --- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From c43b98b48c09a6a45810f899fc5775542ffb7e1c Mon Sep 17 00:00:00 2001 +From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with @@ -13,10 +13,10 @@ Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60 1 file changed, 6 insertions(+) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 020b14cc83..fb9d79dc80 100644 +index 9da1361c95..5e802dea4c 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -203,3 +203,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) +@@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) ) endif() !!ENDIF @@ -27,5 +27,5 @@ index 020b14cc83..fb9d79dc80 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.26.2 +2.28.0 |