| 1 |
johu 15/06/25 18:21:52 |
| 2 |
|
| 3 |
Added: quassel-0.12.2-qt55.patch |
| 4 |
Log: |
| 5 |
Revision bump adds patch by Armin K <krejzi@×××××.com> fixes build with Qt 5.5. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-irc/quassel/files/quassel-0.12.2-qt55.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/files/quassel-0.12.2-qt55.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/files/quassel-0.12.2-qt55.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: quassel-0.12.2-qt55.patch |
| 16 |
=================================================================== |
| 17 |
From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Armin K <krejzi@×××××.com> |
| 19 |
Date: Sat, 2 May 2015 23:04:53 +0200 |
| 20 |
Subject: [PATCH] Fix build with Qt-5.5 |
| 21 |
|
| 22 |
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c |
| 23 |
--- |
| 24 |
src/client/treemodel.cpp | 5 ++--- |
| 25 |
src/common/peer.h | 1 + |
| 26 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 27 |
|
| 28 |
diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp |
| 29 |
index f599803..fd47bc0 100644 |
| 30 |
--- a/src/client/treemodel.cpp |
| 31 |
+++ b/src/client/treemodel.cpp |
| 32 |
@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds() |
| 33 |
ChildStatus cs = _childStatus; |
| 34 |
#ifndef QT_NO_DEBUG |
| 35 |
QModelIndex parent = indexByItem(parentItem); |
| 36 |
-#endif |
| 37 |
Q_ASSERT(cs.parent == parent); |
| 38 |
Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1); |
| 39 |
- |
| 40 |
+#endif |
| 41 |
_aboutToRemoveOrInsert = false; |
| 42 |
for (int i = cs.start; i <= cs.end; i++) { |
| 43 |
connectItem(parentItem->child(i)); |
| 44 |
@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds() |
| 45 |
#ifndef QT_NO_DEBUG |
| 46 |
ChildStatus cs = _childStatus; |
| 47 |
QModelIndex parent = indexByItem(parentItem); |
| 48 |
-#endif |
| 49 |
Q_ASSERT(cs.parent == parent); |
| 50 |
Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1); |
| 51 |
+#endif |
| 52 |
_aboutToRemoveOrInsert = false; |
| 53 |
|
| 54 |
endRemoveRows(); |
| 55 |
diff --git a/src/common/peer.h b/src/common/peer.h |
| 56 |
index 02eb3c0..79204b4 100644 |
| 57 |
--- a/src/common/peer.h |
| 58 |
+++ b/src/common/peer.h |
| 59 |
@@ -22,6 +22,7 @@ |
| 60 |
#define PEER_H |
| 61 |
|
| 62 |
#include <QAbstractSocket> |
| 63 |
+#include <QDataStream> |
| 64 |
#include <QPointer> |
| 65 |
|
| 66 |
#include "authhandler.h" |
| 67 |
-- |
| 68 |
2.4.0 |
Archives