From fd1c42b3c32f932d1ada4c09577c98cfb681cd4b Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 23 Dec 2016 10:38:27 +0100
Subject: [PATCH] port use of tcp server to Qt5

---
 src/Gui/OnlineDocumentation.cpp | 4 ++++
 src/Gui/OnlineDocumentation.h   | 4 ++++
 src/Mod/Web/App/Server.cpp      | 4 ++++
 src/Mod/Web/App/Server.h        | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp
index a7cac0d0fe..c918188e12 100644
--- a/src/Gui/OnlineDocumentation.cpp
+++ b/src/Gui/OnlineDocumentation.cpp
@@ -238,7 +238,11 @@ HttpServer::HttpServer(QObject* parent)
 {
 }
 
+#if QT_VERSION >=0x050000
+void HttpServer::incomingConnection(qintptr socket)
+#else
 void HttpServer::incomingConnection(int socket)
+#endif
 {
     if (disabled)
         return;
diff --git a/src/Gui/OnlineDocumentation.h b/src/Gui/OnlineDocumentation.h
index 3dd0a08ace..b4ec736e76 100644
--- a/src/Gui/OnlineDocumentation.h
+++ b/src/Gui/OnlineDocumentation.h
@@ -61,7 +61,11 @@ class HttpServer : public QTcpServer
 public:
     HttpServer(QObject* parent = 0);
 
+#if QT_VERSION >=0x050000
+    void incomingConnection(qintptr socket);
+#else
     void incomingConnection(int socket);
+#endif
     void pause();
     void resume();
 
diff --git a/src/Mod/Web/App/Server.cpp b/src/Mod/Web/App/Server.cpp
index a96ac42a7f..fc87f651a0 100644
--- a/src/Mod/Web/App/Server.cpp
+++ b/src/Mod/Web/App/Server.cpp
@@ -114,7 +114,11 @@ AppServer::AppServer(QObject* parent)
 {
 }
 
+#if QT_VERSION >=0x050000
+void AppServer::incomingConnection(qintptr socket)
+#else
 void AppServer::incomingConnection(int socket)
+#endif
 {
     QTcpSocket* s = new QTcpSocket(this);
     connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));
diff --git a/src/Mod/Web/App/Server.h b/src/Mod/Web/App/Server.h
index 574ec54f7e..c391f94426 100644
--- a/src/Mod/Web/App/Server.h
+++ b/src/Mod/Web/App/Server.h
@@ -84,7 +84,11 @@ class AppServer : public QTcpServer
 public:
     AppServer(QObject* parent = 0);
 
+#if QT_VERSION >=0x050000
+    void incomingConnection(qintptr socket);
+#else
     void incomingConnection(int socket);
+#endif
 
 protected:
     void customEvent(QEvent* e);