diff options
Diffstat (limited to '0032-Fix-linking-against-static-plugins-with-qmake.patch')
| -rw-r--r-- | 0032-Fix-linking-against-static-plugins-with-qmake.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch index 7fcbbc33beae..937d57db9d33 100644 --- a/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,7 +1,7 @@ -From dc6f09599400e4e6a790ba8bdd8fce3b6dc419de Mon Sep 17 00:00:00 2001 +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/33] Fix linking against static plugins with qmake +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' @@ -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 2c4d6cd97e..a15ab81899 100644 +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 |