aboutsummaryrefslogtreecommitdiff
path: root/src/server/QXmppServer.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2013-08-26 12:38:38 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2013-08-26 12:38:38 +0200
commite8957a83e29f0a40153be952bb32aaaea4cc5584 (patch)
treeb8264242760c856eebcde65984bfecd003023ae1 /src/server/QXmppServer.cpp
parent9565e3b3684eb5ba5ca8a3d818f51d5f59f5ca0f (diff)
Fix QXmppServer incoming connections with Qt5 (issue 175).
Diffstat (limited to 'src/server/QXmppServer.cpp')
-rw-r--r--src/server/QXmppServer.cpp4
1 files changed, 4 insertions, 0 deletions
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)) {