aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/quicktestresult.cpp9
-rw-r--r--src/qmltest/quicktestresult_p.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index f3379ad14b..1924be0d26 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -404,14 +404,7 @@ bool QuickTestResult::compare
}
}
-void QuickTestResult::skipSingle
- (const QString &message, const QString &file, int line)
-{
- QTestResult::addSkip(message.toLatin1().constData(),
- qtest_fixFile(file).toLatin1().constData(), line);
-}
-
-void QuickTestResult::skipAll
+void QuickTestResult::skip
(const QString &message, const QString &file, int line)
{
QTestResult::addSkip(message.toLatin1().constData(),
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index 3e0ea18d25..8707b563e4 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -129,8 +129,7 @@ public Q_SLOTS:
bool compare(bool success, const QString &message,
const QString &val1, const QString &val2,
const QString &file, int line);
- void skipSingle(const QString &message, const QString &file, int line);
- void skipAll(const QString &message, const QString &file, int line);
+ void skip(const QString &message, const QString &file, int line);
bool expectFail(const QString &tag, const QString &comment,
const QString &file, int line);
bool expectFailContinue(const QString &tag, const QString &comment,