Fix QXmppServer incoming connections with Qt5 (issue 175).

3 files changed, 12 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 85add854..0e877d05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+QXmpp 0.7.7 (UNRELEASED)
+
+  - Fix QXmppServer incoming connections with Qt5 (issue 175).
+
 QXmpp 0.7.6 (Mar 9, 2013)
 -------------------------
 
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 0d10b395..bfa23cee 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -865,7 +865,11 @@ QXmppSslServer::~QXmppSslServer()
     delete d;
 }
 
+#if QT_VERSION < 0x050000
 void QXmppSslServer::incomingConnection(int socketDescriptor)
+#else
+void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
+#endif
 {
     QSslSocket *socket = new QSslSocket;
     if (!socket->setSocketDescriptor(socketDescriptor)) {
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index f7aca3b1..69eca8aa 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -141,7 +141,11 @@ signals:
     void newConnection(QSslSocket *socket);
 
 private:
+    #if QT_VERSION < 0x050000
     void incomingConnection(int socketDescriptor);
+    #else
+    void incomingConnection(qintptr socketDescriptor);
+    #endif
     QXmppSslServerPrivate * const d;
 };