diff options
| author | Vincas Dargis <vindrg@gmail.com> | 2015-05-06 13:21:34 +0300 |
|---|---|---|
| committer | Vincas Dargis <vindrg@gmail.com> | 2015-05-08 10:29:45 +0000 |
| commit | 25e2cbba97ad53036aafa4a2b8cb5ad420d8fe05 (patch) | |
| tree | 7ef788d286995f36f3c114f94b60d5d8e9c5746b /qtservice/src/qtservice_unix.cpp | |
| parent | 841982ceec9d30a7ab7324979a0fd5c9c36fd121 (diff) | |
Qt Service solution: Use qintptr in QtServiceSysPrivate::incomingConnection() for Qt 5.
Task-number: QTSOLBUG-180
Change-Id: I05f960ab342eb114c07e19af0d3b31507d17068f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'qtservice/src/qtservice_unix.cpp')
| -rw-r--r-- | qtservice/src/qtservice_unix.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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); |