* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From e12301fa179a7196624b12d02a2ddacd997ecc7e 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.43.0
|
|
|