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

 Conflicts:
	.qmake.conf
	src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
	src/qml/compiler/qv4codegen.cpp
	tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp

Change-Id: I010505326d76ee728ffe5fbd4c7879f28adadb12

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 09480a8e1a..f179093a3d 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -78,6 +78,7 @@ private slots:
     void testGroupedPropertyRevisions();
     void componentFromEval();
     void qrcUrls();
+    void cppSignalAndEval();
 
 public slots:
     QObject *createAQObjectForOwnershipTest ()
@@ -920,6 +921,37 @@ void tst_qqmlengine::qrcUrls()
     }
 }
 
+class ObjectCaller : public QObject
+{
+    Q_OBJECT
+signals:
+    void doubleReply(const double a);
+};
+
+void tst_qqmlengine::cppSignalAndEval()
+{
+    ObjectCaller objectCaller;
+    QQmlEngine engine;
+    engine.rootContext()->setContextProperty(QLatin1Literal("CallerCpp"), &objectCaller);
+    QQmlComponent c(&engine);
+    c.setData("import QtQuick 2.9\n"
+              "Item {\n"
+              "    property var r: 0\n"
+              "    Connections {\n"
+              "        target: CallerCpp;\n"
+              "        onDoubleReply: {\n"
+              "            eval('var z = 1');\n"
+              "            r = a;\n"
+              "        }\n"
+              "    }\n"
+              "}",
+              QUrl(QStringLiteral("qrc:/main.qml")));
+    QScopedPointer<QObject> object(c.create());
+    QVERIFY(!object.isNull());
+    emit objectCaller.doubleReply(1.1234);
+    QCOMPARE(object->property("r"), 1.1234);
+}
+
 QTEST_MAIN(tst_qqmlengine)
 
 #include "tst_qqmlengine.moc"