Skip to content

Commit 25e2cbb

Browse files
committed
Qt Service solution: Use qintptr in QtServiceSysPrivate::incomingConnection() for Qt 5.
Task-number: QTSOLBUG-180 Change-Id: I05f960ab342eb114c07e19af0d3b31507d17068f Reviewed-by: Friedemann Kleint <[email protected]>
1 parent 841982c commit 25e2cbb

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

qtservice/src/qtservice_unix.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,11 @@ class QtServiceSysPrivate : public QtUnixServerSocket
281281
QtServiceBase::ServiceFlags serviceFlags;
282282

283283
protected:
284+
#if QT_VERSION >= 0x050000
285+
void incomingConnection(qintptr socketDescriptor);
286+
#else
284287
void incomingConnection(int socketDescriptor);
288+
#endif
285289

286290
private slots:
287291
void slotReady();
@@ -303,7 +307,11 @@ QtServiceSysPrivate::~QtServiceSysPrivate()
303307
delete[] ident;
304308
}
305309

310+
#if QT_VERSION >= 0x050000
311+
void QtServiceSysPrivate::incomingConnection(qintptr socketDescriptor)
312+
#else
306313
void QtServiceSysPrivate::incomingConnection(int socketDescriptor)
314+
#endif
307315
{
308316
QTcpSocket *s = new QTcpSocket(this);
309317
s->setSocketDescriptor(socketDescriptor);

0 commit comments

Comments
 (0)