aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r--src/qmltest/quicktestresult.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 0853c26f51..e4ef4e68ae 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -645,13 +645,24 @@ void QuickTestResult::ignoreWarning(const QJSValue &message)
{
if (message.isRegExp()) {
#if QT_CONFIG(regularexpression)
- QTestLog::ignoreMessage(QtWarningMsg, message.toVariant().toRegularExpression());
+ QTestLog::ignoreMessage(QtWarningMsg, qjsvalue_cast<QRegularExpression>(message));
#endif
} else {
QTestLog::ignoreMessage(QtWarningMsg, message.toString().toUtf8());
}
}
+void QuickTestResult::failOnWarning(const QJSValue &message)
+{
+ if (message.isRegExp()) {
+#if QT_CONFIG(regularexpression)
+ QTestLog::failOnWarning(qjsvalue_cast<QRegularExpression>(message));
+#endif
+ } else {
+ QTestLog::failOnWarning(message.toString().toUtf8());
+ }
+}
+
void QuickTestResult::wait(int ms)
{
QTest::qWait(ms);