blob: 3bf8989e5d86eebdb5c72b0f18519c79ffedade0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001
From: Armin K <krejzi@email.com>
Date: Sat, 2 May 2015 23:04:53 +0200
Subject: [PATCH] Fix build with Qt-5.5
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
---
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 f599803..fd47bc0 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 02eb3c0..79204b4 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.4.0
|
GitWeb
