Merge branch 'master' into animation-refactorwip/animation-refactor

Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504

1 files changed, 5 insertions, 7 deletions

diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 5887ececa0..c44aaca45c 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** 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)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -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
+}