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

Conflicts:
	src/imports/dialogs/qquickmessagedialog.cpp
	src/imports/dialogs/qquickmessagedialog_p.h
	src/qml/debugger/qqmlprofilerservice_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro

Change-Id: Ic8a43366b44d6970966acbf03b206d0dee00c28d

4 files changed, 105 insertions, 1 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml
new file mode 100644
index 0000000000..25e63669c4
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/signalSourceLocation.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 400
+    height: 400
+
+    onWidthChanged: console.log(width);
+    Component.onCompleted: width = 500;
+}
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
index 87d8b647d1..647d761dc4 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
@@ -19,4 +19,5 @@ OTHER_FILES += \
     data/test.qml \
     data/exit.qml \
     data/scenegraphTest.qml \
-    data/TestImage_2x2.png
+    data/TestImage_2x2.png \
+    data/signalSourceLocation.qml
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 56ed65f54d..9d2e0ecbb4 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -181,6 +181,7 @@ private slots:
     void scenegraphData();
     void profileOnExit();
     void controlFromJS();
+    void signalSourceLocation();
 };
 
 void QQmlProfilerClient::messageReceived(const QByteArray &message)
@@ -513,6 +514,35 @@ void tst_QQmlProfilerService::controlFromJS()
     QCOMPARE(m_client->traceMessages.last().detailType, (int)QQmlProfilerClient::EndTrace);
 }
 
+void tst_QQmlProfilerService::signalSourceLocation()
+{
+    connect(true, "signalSourceLocation.qml");
+    QVERIFY(m_client);
+    QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled);
+
+    m_client->setTraceState(true);
+    while (!(m_process->output().contains(QLatin1String("500"))))
+        QVERIFY(QQmlDebugTest::waitForSignal(m_process, SIGNAL(readyReadStandardOutput())));
+    m_client->setTraceState(false);
+    QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), "No trace received in time.");
+
+    // must start with "StartTrace"
+    QCOMPARE(m_client->traceMessages.first().messageType, (int)QQmlProfilerClient::Event);
+    QCOMPARE(m_client->traceMessages.first().detailType, (int)QQmlProfilerClient::StartTrace);
+
+    QVERIFY(m_client->traceMessages[14].detailData.endsWith("signalSourceLocation.qml"));
+    QVERIFY(m_client->traceMessages[14].line == 8);
+    QVERIFY(m_client->traceMessages[14].column == 28);
+
+    QVERIFY(m_client->traceMessages[16].detailData.endsWith("signalSourceLocation.qml"));
+    QVERIFY(m_client->traceMessages[16].line == 7);
+    QVERIFY(m_client->traceMessages[16].column == 21);
+
+    // must end with "EndTrace"
+    QCOMPARE(m_client->traceMessages.last().messageType, (int)QQmlProfilerClient::Event);
+    QCOMPARE(m_client->traceMessages.last().detailType, (int)QQmlProfilerClient::EndTrace);
+}
+
 QTEST_MAIN(tst_QQmlProfilerService)
 
 #include "tst_qqmlprofilerservice.moc"
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index a1662b495c..ba99b34935 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -148,6 +148,8 @@ private slots:
     void functionDeclarationsInConditionals();
 
     void arrayPop_QTBUG_35979();
+
+    void regexpLastMatch();
 };
 
 tst_QJSEngine::tst_QJSEngine()
@@ -2705,6 +2707,68 @@ void tst_QJSEngine::arrayPop_QTBUG_35979()
     QCOMPARE(result.toString(), QString("1,3"));
 }
 
+void tst_QJSEngine::regexpLastMatch()
+{
+    QJSEngine eng;
+
+    QCOMPARE(eng.evaluate("RegExp.input").toString(), QString());
+
+    QJSValue hasProperty;
+
+    for (int i = 1; i < 9; ++i) {
+        hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$" + QString::number(i) + "\")");
+        QVERIFY(hasProperty.isBool());
+        QVERIFY(hasProperty.toBool());
+    }
+
+    hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$0\")");
+    QVERIFY(hasProperty.isBool());
+    QVERIFY(!hasProperty.toBool());
+
+    hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$10\")");
+    QVERIFY(!hasProperty.toBool());
+
+    hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"lastMatch\")");
+    QVERIFY(hasProperty.toBool());
+    hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$&\")");
+    QVERIFY(hasProperty.toBool());
+
+    QJSValue result = eng.evaluate(""
+            "var re = /h(el)l(o)/\n"
+            "var text = \"blah hello world\"\n"
+            "text.match(re)\n");
+    QVERIFY(!result.isError());
+    QJSValue match = eng.evaluate("RegExp.$1");
+    QCOMPARE(match.toString(), QString("el"));
+    match = eng.evaluate("RegExp.$2");
+    QCOMPARE(match.toString(), QString("o"));
+    for (int i = 3; i <= 9; ++i) {
+        match = eng.evaluate("RegExp.$" + QString::number(i));
+        QVERIFY(match.isString());
+        QCOMPARE(match.toString(), QString());
+    }
+    QCOMPARE(eng.evaluate("RegExp.input").toString(), QString("blah hello world"));
+    QCOMPARE(eng.evaluate("RegExp.lastParen").toString(), QString("o"));
+    QCOMPARE(eng.evaluate("RegExp.leftContext").toString(), QString("blah "));
+    QCOMPARE(eng.evaluate("RegExp.rightContext").toString(), QString(" world"));
+
+    QCOMPARE(eng.evaluate("RegExp.lastMatch").toString(), QString("hello"));
+
+    result = eng.evaluate(""
+            "var re = /h(ello)/\n"
+            "var text = \"hello\"\n"
+            "text.match(re)\n");
+    QVERIFY(!result.isError());
+    match = eng.evaluate("RegExp.$1");
+    QCOMPARE(match.toString(), QString("ello"));
+    for (int i = 2; i <= 9; ++i) {
+        match = eng.evaluate("RegExp.$" + QString::number(i));
+        QVERIFY(match.isString());
+        QCOMPARE(match.toString(), QString());
+    }
+
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"