Update to 5.10.1

1 files changed, 37 insertions, 0 deletions

diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch
new file mode 100644
index 000000000000..6b7b9f0df8c1
--- /dev/null
+++ b/0032-Fix-linking-against-static-plugins-with-qmake.patch
@@ -0,0 +1,37 @@
+From 715c87c76624306c9b9410dc4efa7b6d64ca6788 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 25 Aug 2017 17:07:17 +0200
+Subject: [PATCH 32/32] Fix linking against static plugins with qmake
+
+Required because qtConfig(static) does not work
+with 'Merge shared and static library trees'
+approach
+---
+ mkspecs/features/qt.prf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
+index 6eebd068f1..310b8713f0 100644
+--- a/mkspecs/features/qt.prf
++++ b/mkspecs/features/qt.prf
+@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
+ 
+ QTPLUGIN = $$unique($$list($$lower($$QTPLUGIN)))
+ 
+-import_plugins:qtConfig(static) {
++import_plugins:static {
+     manualplugs = $$QTPLUGIN  # User may specify plugins. Mostly legacy.
+     autoplugs =  # Auto-added plugins.
+     # First round: explicitly specified modules.
+@@ -139,7 +139,7 @@ import_plugins:qtConfig(static) {
+ }
+ 
+ # Only link against plugins in static builds
+-!isEmpty(QTPLUGIN):qtConfig(static) {
++!isEmpty(QTPLUGIN):static {
+     for (plug, QTPLUGIN) {
+         # Check if the plugin is known to Qt. We can use this to determine
+         # the plugin path. Unknown plugins must rely on the default link path.
+-- 
+2.16.1
+