aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/testlib
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/testlib')
-rw-r--r--src/imports/testlib/TestCase.qml5
-rw-r--r--src/imports/testlib/testcase.qdoc14
2 files changed, 4 insertions, 15 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 020f934aac..fd04c786a2 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -307,14 +307,15 @@ Item {
function skip(msg) {
if (msg === undefined)
msg = ""
- qtest_results.skipSingle(msg, util.callerFile(), util.callerLine())
+ qtest_results.skip(msg, util.callerFile(), util.callerLine())
throw new Error("QtQuickTest::skip")
}
function skipAll(msg) {
if (msg === undefined)
msg = ""
- qtest_results.skipAll(msg, util.callerFile(), util.callerLine())
+ 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())
throw new Error("QtQuickTest::skip")
}
diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc
index c08af334e5..719d9baea7 100644
--- a/src/imports/testlib/testcase.qdoc
+++ b/src/imports/testlib/testcase.qdoc
@@ -362,19 +362,7 @@
Skips the current test case and prints the optional \a message.
If this is a data-driven test, then only the current row is skipped.
- Similar to \c{QSKIP(message, SkipSingle)} in C++.
-
- \sa skipAll()
-*/
-
-/*!
- \qmlmethod TestCase::skipAll(message = "")
-
- Skips the current test case and prints the optional \a message.
- If this is a data-driven test, then all remaining rows are skipped.
- Similar to \c{QSKIP(message, SkipAll)} in C++.
-
- \sa skip()
+ Similar to \c{QSKIP(message)} in C++.
*/
/*!