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

Change-Id: I5d2c3da38df35922b2147c3c0bc55c6c3bae2fe5

2 files changed, 38 insertions, 0 deletions

diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
index d9f64f3899..84f5eebd10 100644
--- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
@@ -321,6 +321,8 @@ private slots:
     void lastLineOfConditional();
 
     void readThis();
+    void signalParameters();
+
 private:
     QV4Debugger *debugger() const
     {
@@ -898,6 +900,31 @@ void tst_qv4debugger::readThis()
     QCOMPARE(a.value("value").toInt(), 5);
 }
 
+void tst_qv4debugger::signalParameters()
+{
+    QQmlEngine engine;
+    QV4::ExecutionEngine *v4 = engine.handle();
+    v4->setDebugger(new QV4Debugger(v4));
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQml 2.12\n"
+                      "QtObject {\n"
+                      "    id: root\n"
+                      "    property string result\n"
+                      "    signal signalWithArg(string textArg)\n"
+                      "    property Connections connections : Connections {\n"
+                      "        target: root\n"
+                      "        onSignalWithArg: { root.result = textArg; }\n"
+                      "    }\n"
+                      "    Component.onCompleted: signalWithArg('something')\n"
+                      "}", QUrl("test.qml"));
+
+    QVERIFY(component.isReady());
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj);
+    QCOMPARE(obj->property("result").toString(), QLatin1String("something"));
+}
+
 QTEST_MAIN(tst_qv4debugger)
 
 #include "tst_qv4debugger.moc"
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 393758eee4..72a524ece5 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -368,6 +368,7 @@ private slots:
     void saveAccumulatorBeforeToInt32();
     void intMinDividedByMinusOne();
     void undefinedPropertiesInObjectWrapper();
+    void hugeRegexpQuantifiers();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -8994,6 +8995,16 @@ void tst_qqmlecmascript::undefinedPropertiesInObjectWrapper()
     QVERIFY(!object.isNull());
 }
 
+void tst_qqmlecmascript::hugeRegexpQuantifiers()
+{
+    QJSEngine engine;
+    QJSValue value = engine.evaluate("/({3072140529})?{3072140529}/");
+
+    // It's a regular expression, but it won't match anything.
+    // The RegExp compiler also shouldn't crash.
+    QVERIFY(value.isRegExp());
+}
+
 QTEST_MAIN(tst_qqmlecmascript)
 
 #include "tst_qqmlecmascript.moc"