From 263f5480e22eb0d26e3909f4c208e34d01c4cbc3 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 27 Jun 2014 04:36:10 +0100
Subject: [PATCH] [qxt] incomingConnection has a different signature

---
 thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp | 5 +++++
 thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp
index f24214740..e4a818122 100644
--- a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp
+++ b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp
@@ -197,8 +197,13 @@ bool QxtSslServer::autoEncrypt() const
 /*!
  * \reimp
  */
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+void QxtSslServer::incomingConnection(qintptr socketDescriptor)
+#else
 void QxtSslServer::incomingConnection(int socketDescriptor)
+#endif
 {
+    qWarning() << Q_FUNC_INFO << socketDescriptor;
     QSslSocket* socket = new QSslSocket(this);
     if(socket->setSocketDescriptor(socketDescriptor)) {
         socket->setLocalCertificate(qxt_d().localCertificate);
diff --git a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h
index 4a787d20f..e32251024 100644
--- a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h
+++ b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h
@@ -61,7 +61,11 @@ public:
     bool autoEncrypt() const;
 
 protected:
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    virtual void incomingConnection(qintptr socketDescriptor);
+#else
     virtual void incomingConnection(int socketDescriptor);
+#endif
 
 private:
     QXT_DECLARE_PRIVATE(QxtSslServer)