aboutsummarylogtreecommitdiffstats
path: root/0016-Rename-qtmain-to-qt5main.patch
diff options
context:
space:
mode:
authorMartchus2017-12-14 01:06:18 +0100
committerMartchus2017-12-14 01:06:18 +0100
commite66443501f7b410db4b278c8cff5e75792108285 (patch)
tree79c27c795c5df4a0d39222e2a07b5176aed24d7c /0016-Rename-qtmain-to-qt5main.patch
parent3e19ccfbbef7d70aff50d047063155091be8c4e8 (diff)
downloadaur-e66443501f7b410db4b278c8cff5e75792108285.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 a2a5d38761f6..26b8cf2fec5b 100644
--- a/0016-Rename-qtmain-to-qt5main.patch
+++ b/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b 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/33] 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.14.2
+2.15.1