diff options
Diffstat (limited to '0032-Fix-linking-against-static-plugins-with-qmake.patch')
| -rw-r--r-- | 0032-Fix-linking-against-static-plugins-with-qmake.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch deleted file mode 100644 index f01fa5d61d48..000000000000 --- a/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05a8d15d8f9e5b0bc6489ef29bdc94e4a047df13 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Fri, 25 Aug 2017 17:07:17 +0200 -Subject: [PATCH 32/34] 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 167b8dbf2c..5cfb4f62c9 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.21.0 - |