Murmur: fix override of TcpSocket::incomingConnection(). it takes a qintptr (and not an int) in Qt 5.

2 files changed, 9 insertions, 1 deletions

diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 3bdccdb1f..30dc4f176 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -73,7 +73,11 @@ void ExecEvent::execute() {
 SslServer::SslServer(QObject *p) : QTcpServer(p) {
 }
 
+#if QT_VERSION >= 0x050000
+void SslServer::incomingConnection(qintptr v) {
+#else
 void SslServer::incomingConnection(int v) {
+#endif
 	QSslSocket *s = new QSslSocket(this);
 	s->setSocketDescriptor(v);
 	qlSockets.append(s);
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);