aboutsummarylogtreecommitdiffstats
path: root/0031-Hardcode-linker-flags-for-platform-plugins.patch
diff options
context:
space:
mode:
authorMartchus2018-05-28 21:50:43 +0200
committerMartchus2018-05-28 21:50:43 +0200
commit1de5b17c1169b308c3a014303dc8217228b90cca (patch)
treed2cdeb79f6dc53b2c55cbfbc84e191ca59508b7b /0031-Hardcode-linker-flags-for-platform-plugins.patch
parent5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (diff)
downloadaur-1de5b17c1169b308c3a014303dc8217228b90cca.tar.gz
Update to 5.11.0
Diffstat (limited to '0031-Hardcode-linker-flags-for-platform-plugins.patch')
-rw-r--r--0031-Hardcode-linker-flags-for-platform-plugins.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0031-Hardcode-linker-flags-for-platform-plugins.patch b/0031-Hardcode-linker-flags-for-platform-plugins.patch
index 807a40e7441f..6f873f40eb9b 100644
--- a/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0031-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,19 +1,19 @@
-From 299bb52899d3970ff33698305e4de8ae3ac26dae Mon Sep 17 00:00:00 2001
+From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 31/32] Hardcode linker flags for platform plugins
+Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll
and libqwindows.dll
---
- src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++--
- src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
- src/plugins/platforms/windows/windows.pro | 32 +++++++++++++++++++--------
+ src/plugins/platforms/minimal/minimal.pro | 15 +++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++--
+ src/plugins/platforms/windows/windows.pro | 32 +++++++++++++------
3 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
-index 8cfb68824e..46834a71fc 100644
+index a1a2da547b..7ef91b574d 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,8 +1,19 @@
@@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
-2.16.1
+2.17.0