Fix build with Qt-5.5

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index f599803..fd47bc0 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
     ChildStatus cs = _childStatus;
 #ifndef QT_NO_DEBUG
     QModelIndex parent = indexByItem(parentItem);
     ChildStatus cs = _childStatus;
 #ifndef QT_NO_DEBUG
     QModelIndex parent = indexByItem(parentItem);

-#endif

     Q_ASSERT(cs.parent == parent);
     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
     Q_ASSERT(cs.parent == parent);
     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);

-
+#endif

     _aboutToRemoveOrInsert = false;
     for (int i = cs.start; i <= cs.end; i++) {
         connectItem(parentItem->child(i));
     _aboutToRemoveOrInsert = false;
     for (int i = cs.start; i <= cs.end; i++) {
         connectItem(parentItem->child(i));


@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
 #ifndef QT_NO_DEBUG
     ChildStatus cs = _childStatus;
     QModelIndex parent = indexByItem(parentItem);
 #ifndef QT_NO_DEBUG
     ChildStatus cs = _childStatus;
     QModelIndex parent = indexByItem(parentItem);

-#endif

     Q_ASSERT(cs.parent == parent);
     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
     Q_ASSERT(cs.parent == parent);
     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);

+#endif

     _aboutToRemoveOrInsert = false;
 
     endRemoveRows();
     _aboutToRemoveOrInsert = false;
 
     endRemoveRows();

diff --git a/src/common/peer.h b/src/common/peer.h
index 02eb3c0..79204b4 100644 (file)
--- a/src/common/peer.h
+++ b/src/common/peer.h
@@ -22,6 +22,7 @@
 #define PEER_H
 
 #include <QAbstractSocket>
 #define PEER_H
 
 #include <QAbstractSocket>

+#include <QDataStream>

 #include <QPointer>
 
 #include "authhandler.h"
 #include <QPointer>
 
 #include "authhandler.h"