aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult_p.h
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2017-01-12 10:52:02 +0100
committerLiang Qi <liang.qi@qt.io>2018-04-09 17:25:42 +0000
commitf257be627cc9de4fdec430e2fe8f6ac3b6827070 (patch)
tree4a1a07adf994c4f7a448fa2fae51ec7703a0340a /src/qmltest/quicktestresult_p.h
parent61b7f5a0c1280d93d00c74e393c8244be626168c (diff)
testlib: Support regular expression ignores in ignoreMessage
This is a feature C++ has that the QML side lacked. [ChangeLog][Qt Quick Test][TestCase] ignoreWarning now supports ignoring regular expressions as well as strings. Task-number: QTBUG-47111 Change-Id: If3b7b78365e60f1d8d276050ba7e00fac43400e1 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmltest/quicktestresult_p.h')
-rw-r--r--src/qmltest/quicktestresult_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index 6e7b72830e..f222cd3e87 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -137,7 +137,7 @@ public Q_SLOTS:
const QUrl &location, int line);
void warn(const QString &message, const QUrl &location, int line);
- void ignoreWarning(const QString &message);
+ void ignoreWarning(const QJSValue &message);
void wait(int ms);
void sleep(int ms);