diff options
| author | Michel Zou | 2019-02-22 18:26:23 +0100 |
|---|---|---|
| committer | Michel Zou | 2019-02-22 18:26:23 +0100 |
| commit | ea2da1870c5d80e4c77364d198aa1fad64b8c4f0 (patch) | |
| tree | 09c9102d7a602ff0d04c165cec8ece1e216705cc /0032-Fix-linking-against-static-plugins-with-qmake.patch | |
| parent | 12107bedc14b62761fd2de498659c6b19768d59c (diff) | |
| download | aur-mingw-w64-qt5-base-nostatx.tar.gz | |
5.12.1
Diffstat (limited to '0032-Fix-linking-against-static-plugins-with-qmake.patch')
| -rw-r--r-- | 0032-Fix-linking-against-static-plugins-with-qmake.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch index ed128a90f1eb..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 e8da100dec44bc38ec5eb9675f231c5d14d2e62f 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 @@ -33,5 +33,5 @@ index 2c4d6cd97e..a15ab81899 100644 # 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.19.2 +2.20.1 |