diff options
| author | Martchus | 2019-06-26 14:41:33 +0200 |
|---|---|---|
| committer | Martchus | 2019-06-26 14:41:33 +0200 |
| commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
| tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | |
| parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
| download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz | |
Update to 5.13.0
Diffstat (limited to '0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch')
| -rw-r--r-- | 0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch deleted file mode 100644 index b626f51c88d5..000000000000 --- a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 96e14e82726f32e222c506c41b3917897ec8482c Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Fri, 2 Jun 2017 16:42:07 +0200 -Subject: [PATCH 24/34] Adjust linker flags for static build with - cmake/mingw-w64 - -Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d ---- - src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index f0add757bb..5328da2e80 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -173,3 +173,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH) - set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\") - - _qt5_Core_check_file_exists(${_Qt5CTestMacros}) -+ -+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>) -+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32 -+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") -+unset(_isExe) -+!!ENDIF --- -2.21.0 - |