Martchus
057fb81690
Rebase patches against latest KDE commit and adapt them to glib2 now using pcre2.
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 4d3a43981b30e5dce6a39caa9a996a3715747bb2 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
|
Subject: [PATCH 30/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 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
|
|
|
|
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.
|
|
@@ -142,7 +142,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.37.3
|
|
|