From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 24 Mar 2014 20:05:54 +0000 (+0100)
Subject: Signature of QTcpServer::incomingConnection() changed in Qt5
X-Git-Tag: 0.11.0~79
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c1572b1c1d6effb21083c6b09f08b30824827a98;hp=2f692b299eded9386fdee3e7a13727d95bbe2495

Signature of QTcpServer::incomingConnection() changed in Qt5
---

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: