Update to 5.10.1

1 files changed, 0 insertions, 29 deletions

diff --git a/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
deleted file mode 100644
index 263cb9a92d11..000000000000
--- a/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 25/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 ebe6644dfe..687d611b3f 100644
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -190,3 +190,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.15.1
-