Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I34aa0c2eb178862b40e63b62c6daa056e5e204c6

2 files changed, 12 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.
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index f222cd3e87..b2eeefdfff 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -76,6 +76,7 @@ class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject
     Q_PROPERTY(int failCount READ failCount)
     Q_PROPERTY(int skipCount READ skipCount)
     Q_PROPERTY(QStringList functionsToRun READ functionsToRun)
+    Q_PROPERTY(QStringList tagsToRun READ tagsToRun)
 public:
     QuickTestResult(QObject *parent = nullptr);
     ~QuickTestResult() override;
@@ -107,6 +108,7 @@ public:
     int skipCount() const;
 
     QStringList functionsToRun() const;
+    QStringList tagsToRun() const;
 
 public Q_SLOTS:
     void reset();