forked from pool/quassel
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 103a8b3c31f75e4958581162392deaf70ffebf95 Mon Sep 17 00:00:00 2001
|
|
From: Armin K <krejzi@email.com>
|
|
Date: Sat, 2 May 2015 23:04:53 +0200
|
|
Subject: [PATCH 1/1] Fix build with Qt-5.5
|
|
|
|
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
|
|
(cherry picked from commit 078477395aaec1edee90922037ebc8a36b072d90)
|
|
---
|
|
src/client/treemodel.cpp | 5 ++---
|
|
src/common/peer.h | 1 +
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
|
|
index f599803d7dc93e7810170b01e4c875d9d2ba864d..fd47bc04991e8ef86d8bdbd32bf19551a849df67 100644
|
|
--- 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);
|
|
-#endif
|
|
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));
|
|
@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
|
|
#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);
|
|
+#endif
|
|
_aboutToRemoveOrInsert = false;
|
|
|
|
endRemoveRows();
|
|
diff --git a/src/common/peer.h b/src/common/peer.h
|
|
index 02eb3c0cde3813bb20ee4a4f1d783262b0800fae..79204b4f9996a33b2e4cf312ef1eed2f7e1c3caf 100644
|
|
--- a/src/common/peer.h
|
|
+++ b/src/common/peer.h
|
|
@@ -22,6 +22,7 @@
|
|
#define PEER_H
|
|
|
|
#include <QAbstractSocket>
|
|
+#include <QDataStream>
|
|
#include <QPointer>
|
|
|
|
#include "authhandler.h"
|
|
--
|
|
2.6.0
|
|
|