diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-23 19:28:55 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-23 19:28:55 +0000 |
| commit | 30d353c4b160867a291c610d6f7012bea7e54db3 (patch) | |
| tree | e58154d01471ff4524b4fddc9fdf3dce7973cbcd /irc/quassel | |
| parent | 5b0eec5aee83e9c06e5a375b5497f8777e5a0a5c (diff) | |
| download | ports-30d353c4b160867a291c610d6f7012bea7e54db3.tar.gz ports-30d353c4b160867a291c610d6f7012bea7e54db3.zip | |
Add upstream patch to fix the build with the upcoming Qt 5.5.1.
Notes
Notes:
svn path=/head/; revision=407052
Diffstat (limited to 'irc/quassel')
| -rw-r--r-- | irc/quassel/files/patch-git_07847739 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/irc/quassel/files/patch-git_07847739 b/irc/quassel/files/patch-git_07847739 new file mode 100644 index 000000000000..d576b2124af0 --- /dev/null +++ b/irc/quassel/files/patch-git_07847739 @@ -0,0 +1,43 @@ +commit 078477395aaec1edee90922037ebc8a36b072d90 +Author: Armin K <krejzi@email.com> +Date: Sat May 2 23:04:53 2015 +0200 + + Fix build with Qt-5.5 + + http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c + +--- src/client/treemodel.cpp ++++ 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(); +--- src/common/peer.h ++++ src/common/peer.h +@@ -22,6 +22,7 @@ + #define PEER_H + + #include <QAbstractSocket> ++#include <QDataStream> + #include <QPointer> + + #include "authhandler.h" |