summarylogtreecommitdiffstats
path: root/0032-Fix-linking-against-static-plugins-with-qmake.patch
blob: 937d57db9d3367e5ca83d163c829ec443b322ada (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 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 5b05aa9e2a..2732c94797 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.20.1