From 38b59b05636af19430f6b52f7d5385af3076a69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 14 Sep 2015 00:14:56 +0200
Subject: [PATCH] qtconfiguration: fix build with qt 5.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../files/0001-fix-build-with-qt-5.5.patch    | 36 +++++++++++++++++++
 .../qtconfiguration/qtconfiguration_0.3.0.bb  |  5 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch

diff --git a/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch b/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
new file mode 100644
index 00000000..7ba2e041
--- /dev/null
+++ b/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
@@ -0,0 +1,36 @@
+From 9d6d7a17b26935658c8fc546712e423fbd2cfad3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 13 Sep 2015 23:36:56 +0200
+Subject: [PATCH] fix build with qt 5.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/configuration/qgvariantutils.cpp:99:26: error: variable 'QDataStream s' has initializer but incomplete type
+             QDataStream s(&a, QIODevice::ReadOnly);
+                          ^
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/hawaii-desktop/qtconfiguration/pull/1
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/configuration/qgvariantutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/configuration/qgvariantutils.cpp b/src/configuration/qgvariantutils.cpp
+index 757f56d..b5add00 100644
+--- a/src/configuration/qgvariantutils.cpp
++++ b/src/configuration/qgvariantutils.cpp
+@@ -39,6 +39,7 @@
+ #include <QtCore/QDebug>
+ #include <QtCore/QUrl>
+ #include <QtCore/QStringList>
++#include <QDataStream>
+ 
+ #include "qgvariantutils.h"
+ 
+-- 
+2.1.0
+
diff --git a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
index 3a816dc8..e0202805 100644
--- a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
+++ b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
@@ -11,7 +11,10 @@ inherit hawaii cmake-lib
 
 DEPENDS += "dconf"
 
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRC_URI = " \
+    git://github.com/hawaii-desktop/${BPN}.git \
+    file://0001-fix-build-with-qt-5.5.patch \
+"
 SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
 
 S = "${WORKDIR}/git"