port use of tcp server to Qt5

2016-12-23 10:38:27 +01:00
parent 40791cb0a2
commit fd1c42b3c3
4 changed files with 16 additions and 0 deletions
--- 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()));
--- 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);