Merge remote-tracking branch 'origin/4.1'

Change-Id: I86049138466399411ba36791330f4a94faad8c52

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index b7c602e26..105bcf5d7 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -349,6 +349,21 @@ private slots:
       }
     }
 
+    void testComponentsWithRegexp()
+    {
+      const QString script = QString::fromLatin1("var components = installer.components(\"component.test.addOperation\");"
+                                                 "\n"
+                                                 "for (i = 0; i < components.length; i++)"
+                                                 "print(components[i].name);");
+
+      setExpectedScriptOutput("component.test.addOperation");
+      const QJSValue value = m_scriptEngine->evaluate(script);
+      if (value.isError()) {
+        QFAIL(qPrintable(QString::fromLatin1("ScriptEngine error:\n %1").arg(
+                           value.toString())));
+      }
+    }
+
     void testFindFiles()
     {
         const QString expectedOutput = QString::fromLatin1("Found file %1/tst_scriptengine.moc").arg(m_applicatonDirPath);