From 5180186da2644c06c339083a10aab36ed11cf273 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 10 Jan 2012 15:19:47 +1000 Subject: Update copyright year in Nokia copyright headers. Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern --- src/imports/testlib/TestCase.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/testlib/TestCase.qml') diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 5887ececa0..0e49365c5f 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 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 f52cd2cbe2760cc32858628b7d9bba0ffc12e6ba Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 17 Jan 2012 16:12:02 +1000 Subject: Change testlib skipAll function to failure. Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern --- src/imports/testlib/TestCase.qml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/imports/testlib/TestCase.qml') diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 0e49365c5f..182c52755d 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -313,10 +313,8 @@ Item { } function skipAll(msg) { - if (msg === undefined) - msg = "" - warn("The skipAll function is deprecated and will be removed soon. Please update this test by changing skipAll to skip.") - qtest_results.skip(msg, util.callerFile(), util.callerLine()) + msg = "The skipAll function is no longer available. Please update this test by changing skipAll to skip." + qtest_results.fail(msg, util.callerFile(), util.callerLine()) throw new Error("QtQuickTest::skip") } @@ -716,4 +714,4 @@ Item { if (when && !completed && !running) qtest_run() } -} \ No newline at end of file +} -- cgit v1.2.3 From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- src/imports/testlib/TestCase.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/testlib/TestCase.qml') diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 182c52755d..c44aaca45c 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the test suite of the Qt Toolkit. ** -- cgit v1.2.3