diff options
Diffstat (limited to '0030-Fix-linking-against-static-plugins-with-qmake.patch')
| -rw-r--r-- | 0030-Fix-linking-against-static-plugins-with-qmake.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index 4c3e9e3d7888..88595eea8e03 100644 --- a/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 9cc80f62ffaec0261b0d554f80ff1413aa46d4d7 Mon Sep 17 00:00:00 2001 +From ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/31] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 4632cb8b30..7583943bd0 100644 +index b79b324b88..6a03b7a74b 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 @@ -23,7 +23,7 @@ index 4632cb8b30..7583943bd0 100644 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) { +@@ -142,7 +142,7 @@ import_plugins:qtConfig(static) { } # Only link against plugins in static builds @@ -33,5 +33,5 @@ index 4632cb8b30..7583943bd0 100644 # 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.26.2 +2.28.0 |