0001-Fix-build-with-Qt-5.5.patch
src/client/treemodel.cpp | ||
---|---|---|
556 | 556 |
ChildStatus cs = _childStatus; |
557 | 557 |
#ifndef QT_NO_DEBUG |
558 | 558 |
QModelIndex parent = indexByItem(parentItem); |
559 |
#endif |
|
560 | 559 |
Q_ASSERT(cs.parent == parent); |
561 | 560 |
Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1); |
562 | ||
561 |
#endif |
|
563 | 562 |
_aboutToRemoveOrInsert = false; |
564 | 563 |
for (int i = cs.start; i <= cs.end; i++) { |
565 | 564 |
connectItem(parentItem->child(i)); |
... | ... | |
605 | 604 |
#ifndef QT_NO_DEBUG |
606 | 605 |
ChildStatus cs = _childStatus; |
607 | 606 |
QModelIndex parent = indexByItem(parentItem); |
608 |
#endif |
|
609 | 607 |
Q_ASSERT(cs.parent == parent); |
610 | 608 |
Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1); |
609 |
#endif |
|
611 | 610 |
_aboutToRemoveOrInsert = false; |
612 | 611 | |
613 | 612 |
endRemoveRows(); |
src/common/peer.h | ||
---|---|---|
22 | 22 |
#define PEER_H |
23 | 23 | |
24 | 24 |
#include <QAbstractSocket> |
25 |
#include <QDataStream> |
|
25 | 26 |
#include <QPointer> |
26 | 27 | |
27 | 28 |
#include "authhandler.h" |
28 |
- |