Update to 5.13.0

1 files changed, 37 insertions, 0 deletions

diff --git a/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch
new file mode 100644
index 000000000000..5d50a4f08a62
--- /dev/null
+++ b/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch
@@ -0,0 +1,37 @@
+From 85670b69fe04b78bb9b43b490c9a91ef6d79a226 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 3 Feb 2019 14:34:42 +0100
+Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries
+
+The static build should not attempt to link against dynamic libraries
+in order to get a fully statically linked binary in the end.
+---
+ mkspecs/features/qt_configure.prf | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
+index 94eb012b81..96ea2554ec 100644
+--- a/mkspecs/features/qt_configure.prf
++++ b/mkspecs/features/qt_configure.prf
+@@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) {
+                 # Under Windows, we look only for static libraries, as even for DLLs
+                 # one actually links against a static import library.
+                 mingw {
+-                    lcan += \
+-                        # MinGW supports UNIX-style library naming in addition to
+-                        # the MSVC style.
+-                        lib$${lib}.dll.a lib$${lib}.a \
+-                        # Fun fact: prefix-less libraries are also supported.
+-                        $${lib}.dll.a $${lib}.a
++                    # prefer (import) libraries for dynamic linking unless we're doing a
++                    # static build where we solely rely on presence of static libraries
++                    shared {
++                        lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_IMPORTLIB} $${lib}.$${QMAKE_EXTENSION_IMPORTLIB}
++                    }
++                    lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} $${lib}.$${QMAKE_EXTENSION_STATICLIB}
+                 }
+                 lcan += $${lib}.lib
+             }
+-- 
+2.22.0
+