diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-26 01:57:21 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-26 01:57:21 +0300 |
commit | 78ac46880c98b0e91c30eba6ae1b0f6ce539a7fb (patch) | |
tree | 507e138a634281884f7acb55b25e9569427bfc9f /src/murmur/Server.h | |
parent | 7ecf4b35a78ad8adbc34c2f8b89ac3507c4baa64 (diff) |
Murmur: fix override of TcpSocket::incomingConnection(). it takes a qintptr (and not an int) in Qt 5.
Diffstat (limited to 'src/murmur/Server.h')
-rw-r--r-- | src/murmur/Server.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 3aef42c2c..1fb9806b6 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -91,7 +91,11 @@ class SslServer : public QTcpServer { Q_DISABLE_COPY(SslServer) protected: QList<QSslSocket *> qlSockets; - void incomingConnection(int); +#if QT_VERSION >= 0x050000 + void incomingConnection(qintptr) Q_DECL_OVERRIDE; +#else + void incomingConnection(int) Q_DECL_OVERRIDE; +#endif public: QSslSocket *nextPendingSSLConnection(); SslServer(QObject *parent = NULL); |