From 669ca0e18f93e8b52e53b4ba699be081eeff13a8 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 9 Dec 2018 15:40:20 +0100
Subject: Add a patch to make umbrello compile against Qt >= 5.10

---
 .../umbrello/umbrello_qt510_kaboutdata_h.patch     | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch

(limited to 'kde/patch/umbrello')

diff --git a/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch b/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch
new file mode 100644
index 0000000..a27b0ed
--- /dev/null
+++ b/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch
@@ -0,0 +1,33 @@
+From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Thu, 6 Dec 2018 13:36:34 +0100
+Subject: Fix KDE CI compile error with Qt 5.10 on linux
+
+The error was "specialization of template<class T>
+struct QMetaTypeId in different namespace [-fpermissive]"
+
+The Qt 5.10 related issue is fixed by using another approach
+to exclude KF5 class KAboutData.
+---
+ umbrello/main.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index e3315fa..9d2acd8 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -19,9 +19,8 @@
+ 
+ // kde includes
+ #if QT_VERSION > 0x050000
+-namespace dummy {
+-#include <kaboutdata.h>
+-}
++// prevent including of <kaboutdata.h>
++#define KABOUTDATA_H
+ #include <k4aboutdata.h>
+ #define KAboutData K4AboutData
+ #include <KCrash>
+-- 
+cgit v0.11.2
+
-- 
cgit v1.2.3