Merge pull request #78 from seezer/qt5contextmenu
authorManuel Nickschas <sputnick@quassel-irc.org>
Wed, 2 Jul 2014 22:43:01 +0000 (00:43 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Wed, 2 Jul 2014 22:43:01 +0000 (00:43 +0200)
Fix contextmenu actions for Qt5

src/common/protocols/datastream/datastreampeer.cpp
src/common/signalproxy.h

index 52d5afa..7c45b46 100644 (file)
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtEndian>
-
+#include <QDataStream>
 #include <QHostAddress>
 #include <QTcpSocket>
 
index 973ce70..97efc2d 100644 (file)
@@ -27,6 +27,7 @@
 #include "protocol.h"
 
 struct QMetaObject;
+class QIODevice;
 
 class Peer;
 class SyncableObject;