From c1572b1c1d6effb21083c6b09f08b30824827a98 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 24 Mar 2014 21:05:54 +0100 Subject: [PATCH 1/1] Signature of QTcpServer::incomingConnection() changed in Qt5 --- src/core/sslserver.cpp | 5 ++++- src/core/sslserver.h | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp index c44f4096..87ca4522 100644 --- a/src/core/sslserver.cpp +++ b/src/core/sslserver.cpp @@ -56,8 +56,11 @@ QTcpSocket *SslServer::nextPendingConnection() return _pendingConnections.takeFirst(); } - +#if QT_VERSION >= 0x050000 +void SslServer::incomingConnection(qintptr socketDescriptor) +#else void SslServer::incomingConnection(int socketDescriptor) +#endif { QSslSocket *serverSocket = new QSslSocket(this); if (serverSocket->setSocketDescriptor(socketDescriptor)) { diff --git a/src/core/sslserver.h b/src/core/sslserver.h index 9a5d482a..c2644531 100644 --- a/src/core/sslserver.h +++ b/src/core/sslserver.h @@ -43,7 +43,12 @@ public: virtual inline bool isCertValid() const { return _isCertValid; } protected: +#if QT_VERSION >= 0x050000 + virtual void incomingConnection(qintptr socketDescriptor); +#else virtual void incomingConnection(int socketDescriptor); +#endif + virtual bool setCertificate(const QString &path); private: -- 2.20.1