From bdce61002255b5f8b3213e93175cefdfebfde2cc Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Wed, 11 Jan 2012 13:06:14 -0200 Subject: Fixes examples/tests to use qinptr in QTcpServer::incomingConnection. This is a fix for problems introduced by bf7f170. Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a Reviewed-by: Peter Hartmann Reviewed-by: Bradley T. Hughes --- tests/baselineserver/src/baselineserver.cpp | 2 +- tests/baselineserver/src/baselineserver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/baselineserver') diff --git a/tests/baselineserver/src/baselineserver.cpp b/tests/baselineserver/src/baselineserver.cpp index 533ed5d9d9..7adc335fb2 100644 --- a/tests/baselineserver/src/baselineserver.cpp +++ b/tests/baselineserver/src/baselineserver.cpp @@ -101,7 +101,7 @@ QString BaselineServer::settingsFilePath() return settingsFile; } -void BaselineServer::incomingConnection(int socketDescriptor) +void BaselineServer::incomingConnection(qintptr socketDescriptor) { QString runId = QDateTime::currentDateTime().toString(QLS("MMMdd-hhmmss")); if (runId == lastRunId) { diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h index b9b08b29b4..a6065cc099 100644 --- a/tests/baselineserver/src/baselineserver.h +++ b/tests/baselineserver/src/baselineserver.h @@ -69,7 +69,7 @@ public: static QString settingsFilePath(); protected: - void incomingConnection(int socketDescriptor); + void incomingConnection(qintptr socketDescriptor); private slots: void heartbeat(); -- cgit v1.2.3