From 1fdfc2abfe1fa26b86028934d4853432e25b4655 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 5 Jan 2012 14:03:39 +1000 Subject: Update copyright year in license headers. Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern --- tests/baselineserver/src/baselineserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/baselineserver/src/baselineserver.h') diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h index 333d9ed30b..b9b08b29b4 100644 --- a/tests/baselineserver/src/baselineserver.h +++ b/tests/baselineserver/src/baselineserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -- cgit v1.2.3 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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/baselineserver/src/baselineserver.h') 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