2019-11-09 03:03:56 +01:00
|
|
|
From ef72bc6a1e58813a89587ca11bb27e039cba2fc5 Mon Sep 17 00:00:00 2001
|
2017-10-13 21:29:48 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
2019-11-09 03:03:56 +01:00
|
|
|
Subject: [PATCH 30/32] Fix linking against static plugins with qmake
|
2017-10-13 21:29:48 +02:00
|
|
|
|
|
|
|
|
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
|
2019-06-14 19:09:09 +02:00
|
|
|
index d6299d8eed..5311748953 100644
|
2017-10-13 21:29:48 +02:00
|
|
|
--- a/mkspecs/features/qt.prf
|
|
|
|
|
+++ b/mkspecs/features/qt.prf
|
2018-02-15 00:14:36 +01:00
|
|
|
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
|
2017-10-13 21:29:48 +02:00
|
|
|
|
|
|
|
|
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.
|
2018-02-15 00:14:36 +01:00
|
|
|
@@ -139,7 +139,7 @@ import_plugins:qtConfig(static) {
|
2017-10-13 21:29:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
--
|
2019-11-09 03:03:56 +01:00
|
|
|
2.24.0
|
2017-10-13 21:29:48 +02:00
|
|
|
|
