aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 01:00:48 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 01:00:49 +0100
commit0ae32e678eedf7450a0d7291bfb27925874de462 (patch)
tree8ee7d6e6ae56a9963a966ffe59283675e9849b29 /src/qmltest/quicktestresult.cpp
parentfe1f81484bf9d9ace1d8125498a7ce889ba5bddc (diff)
parent87265c7ab8743ece92262cd6b79bbba9dddd1fe1 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r--src/qmltest/quicktestresult.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 4bde5d297b..1b3ea0ae7f 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -381,6 +381,16 @@ QStringList QuickTestResult::functionsToRun() const
}
/*!
+ \qmlproperty list<string> TestResult::tagsToRun
+
+ This property returns the list of test function's data tags to be run
+*/
+QStringList QuickTestResult::tagsToRun() const
+{
+ return QTest::testTags;
+}
+
+/*!
\qmlmethod TestResult::reset()
Resets all pass/fail/skip counters and prepare for testing.