From 25e2cbba97ad53036aafa4a2b8cb5ad420d8fe05 Mon Sep 17 00:00:00 2001 From: Vincas Dargis Date: Wed, 6 May 2015 13:21:34 +0300 Subject: Qt Service solution: Use qintptr in QtServiceSysPrivate::incomingConnection() for Qt 5. Task-number: QTSOLBUG-180 Change-Id: I05f960ab342eb114c07e19af0d3b31507d17068f Reviewed-by: Friedemann Kleint --- qtservice/src/qtservice_unix.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qtservice/src/qtservice_unix.cpp b/qtservice/src/qtservice_unix.cpp index 40d75c1..345acc6 100644 --- a/qtservice/src/qtservice_unix.cpp +++ b/qtservice/src/qtservice_unix.cpp @@ -281,7 +281,11 @@ public: QtServiceBase::ServiceFlags serviceFlags; protected: +#if QT_VERSION >= 0x050000 + void incomingConnection(qintptr socketDescriptor); +#else void incomingConnection(int socketDescriptor); +#endif private slots: void slotReady(); @@ -303,7 +307,11 @@ QtServiceSysPrivate::~QtServiceSysPrivate() delete[] ident; } +#if QT_VERSION >= 0x050000 +void QtServiceSysPrivate::incomingConnection(qintptr socketDescriptor) +#else void QtServiceSysPrivate::incomingConnection(int socketDescriptor) +#endif { QTcpSocket *s = new QTcpSocket(this); s->setSocketDescriptor(socketDescriptor); -- cgit v1.2.3