aboutsummarylogtreecommitdiffstats
path: root/0016-Rename-qtmain-to-qt5main.patch
diff options
context:
space:
mode:
authorMartchus2017-12-14 01:06:21 +0100
committerMartchus2017-12-14 01:06:21 +0100
commit7e661b520812eb973f6393c0a57ace92fbb92b53 (patch)
tree81902cb8cac2af3e638066941e9e38636feb0b8d /0016-Rename-qtmain-to-qt5main.patch
parent25e7d1738f2966725fd45605eb1cb7b584887348 (diff)
downloadaur-7e661b520812eb973f6393c0a57ace92fbb92b53.tar.gz
Update to 5.10.0
Diffstat (limited to '0016-Rename-qtmain-to-qt5main.patch')
-rw-r--r--0016-Rename-qtmain-to-qt5main.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch
index 8db7d578efb7..26b8cf2fec5b 100644
--- a/0016-Rename-qtmain-to-qt5main.patch
+++ b/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From c887523c4b788a35d5d90b1de46c3e3acf4ef03c Mon Sep 17 00:00:00 2001
+From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/31] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
-2.13.2
+2.15.1