From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 2 Jul 2014 22:43:01 +0000 (+0200)
Subject: Merge pull request #78 from seezer/qt5contextmenu
X-Git-Tag: 0.11.0~30
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5fcbaab65066af3c9e8c52176c27a7cf96b80f41;hp=8c8426178ee7e6be923ebb6fe1c96c46d99f57eb

Merge pull request #78 from seezer/qt5contextmenu

Fix contextmenu actions for Qt5
---

diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp
index 52d5afa0..7c45b461 100644
--- a/src/common/protocols/datastream/datastreampeer.cpp
+++ b/src/common/protocols/datastream/datastreampeer.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtEndian>
-
+#include <QDataStream>
 #include <QHostAddress>
 #include <QTcpSocket>
 
diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 973ce70c..97efc2d7 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -27,6 +27,7 @@
 #include "protocol.h"
 
 struct QMetaObject;
+class QIODevice;
 
 class Peer;
 class SyncableObject;