From ad7bd8066f3cc2de2855db24bfcfb7bc42f7550d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Sat, 12 Dec 2015 21:47:10 +0100
Subject: [PATCH] Add a patch to workaround Qt 5.6 moc bug #1290020

---
 ...ration-5.17-workaround-qtmoc-5.6-bug.patch | 40 +++++++++++++++++++
 kf5-frameworkintegration.spec                 |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch

diff --git a/frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch b/frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch
new file mode 100644
index 0000000..04e072a
--- /dev/null
+++ b/frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch
@@ -0,0 +1,40 @@
+diff --git a/src/platformtheme/kdeplatformsystemtrayicon.h b/src/platformtheme/kdeplatformsystemtrayicon.h
+index 502942e..47cffd6 100644
+--- a/src/platformtheme/kdeplatformsystemtrayicon.h
++++ b/src/platformtheme/kdeplatformsystemtrayicon.h
+@@ -28,7 +28,6 @@ class SystemTrayMenuItem;
+ class QAction;
+ class QMenu;
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
+ class SystemTrayMenu : public QPlatformMenu
+ {
+     Q_OBJECT
+@@ -77,9 +76,7 @@ public:
+     void setVisible(bool isVisible) Q_DECL_OVERRIDE;
+     quintptr tag() const Q_DECL_OVERRIDE;
+     void setIconSize(int size)
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+     Q_DECL_OVERRIDE
+-#endif
+     ;
+ 
+     QAction *action() const;
+@@ -88,7 +85,6 @@ private:
+     quintptr m_tag;
+     QAction *m_action;
+ };
+-#endif
+ 
+ class KDEPlatformSystemTrayIcon : public QPlatformSystemTrayIcon
+ {
+@@ -108,9 +104,7 @@ public:
+     bool isSystemTrayAvailable() const Q_DECL_OVERRIDE;
+     bool supportsMessages() const Q_DECL_OVERRIDE;
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
+     QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
+-#endif
+ 
+ private:
+     KStatusNotifierItem *m_sni;
diff --git a/kf5-frameworkintegration.spec b/kf5-frameworkintegration.spec
index ce05b31..9ce6778 100644
--- a/kf5-frameworkintegration.spec
+++ b/kf5-frameworkintegration.spec
@@ -17,6 +17,7 @@ URL:            https://projects.kde.org/projects/frameworks/frameworkintegratio
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
 # upstream patches
+Patch0:         frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch
 
 BuildRequires:  kf5-rpm-macros >= %{version}
 BuildRequires:  extra-cmake-modules >= %{version}