From 2a5ccd3bd191b75b9fa148a8fa7f3d3ddc225add Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider Date: Sun, 3 Sep 2017 22:00:29 +0200 Subject: Drop support for Qt 4 --- src/server/QXmppServer.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/server/QXmppServer.cpp') diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp index 13be2169..53b6ba83 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -891,11 +891,7 @@ 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)) { -- cgit v1.2.3 From b71c01824c1637ad75248f5ce46fb4be6032ffc1 Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider Date: Mon, 4 Sep 2017 18:36:23 +0200 Subject: Fix QXmppSslServer::incomingConnection signature --- src/server/QXmppServer.cpp | 2 +- src/server/QXmppServer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/QXmppServer.cpp') diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp index 53b6ba83..73a7415e 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -891,7 +891,7 @@ QXmppSslServer::~QXmppSslServer() delete d; } -void QXmppSslServer::incomingConnection(int socketDescriptor) +void QXmppSslServer::incomingConnection(qintptr socketDescriptor) { QSslSocket *socket = new QSslSocket; if (!socket->setSocketDescriptor(socketDescriptor)) { diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h index 2734105d..992f0c4a 100644 --- a/src/server/QXmppServer.h +++ b/src/server/QXmppServer.h @@ -143,7 +143,7 @@ signals: void newConnection(QSslSocket *socket); private: - void incomingConnection(int socketDescriptor); + void incomingConnection(qintptr socketDescriptor) override; QXmppSslServerPrivate * const d; }; -- cgit v1.2.3