From e8957a83e29f0a40153be952bb32aaaea4cc5584 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 26 Aug 2013 12:38:38 +0200
Subject: Fix QXmppServer incoming connections with Qt5 (issue 175).

---
 src/server/QXmppServer.cpp | 4 ++++
 src/server/QXmppServer.h   | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/server')

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;
 };
 
-- 
cgit v1.2.3