aboutsummarylogtreecommitdiffstats
path: root/0015-Rename-qtmain-to-qt5main.patch
diff options
context:
space:
mode:
authorMartchus2022-04-26 19:38:56 +0200
committerMartchus2022-04-26 19:38:56 +0200
commit6bd8d3a7704d45d2eb9df598c0a326314fa78e8e (patch)
tree026bb60a4c15e2131b26a3be420e24ec18bf947b /0015-Rename-qtmain-to-qt5main.patch
parentf08078c53ded4379c2b660f1f653c2e30bdee865 (diff)
downloadaur-6bd8d3a7704d45d2eb9df598c0a326314fa78e8e.tar.gz
Update KDE fork version, cherry-pick 8797332
Diffstat (limited to '0015-Rename-qtmain-to-qt5main.patch')
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index e377df967ce9..71004c944bef 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From 41922a8bda8c15d44ebe8e3cb7fa36f3da8d2679 Mon Sep 17 00:00:00 2001
+From ddc0494d7eedd5b2d9e81f13e87f409ccb32e0b2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/32] Rename qtmain to qt5main
+Subject: [PATCH 15/33] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
-2.35.1
+2.36.0