Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/quick/items/qquickitem.cpp
	tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index fe3efcd948..253b050b15 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -185,6 +185,8 @@ private slots:
 
     void argumentEvaluationOrder();
 
+    void v4FunctionWithoutQML();
+
 signals:
     void testSignal();
 };
@@ -3794,6 +3796,30 @@ void tst_QJSEngine::argumentEvaluationOrder()
 
 }
 
+class TestObject : public QObject
+{
+    Q_OBJECT
+public:
+    TestObject() : called(false) {}
+
+    bool called;
+
+    Q_INVOKABLE void callMe(QQmlV4Function *) {
+        called = true;
+    }
+};
+
+void tst_QJSEngine::v4FunctionWithoutQML()
+{
+    TestObject obj;
+    QJSEngine engine;
+    QJSValue wrapper = engine.newQObject(&obj);
+    QQmlEngine::setObjectOwnership(&obj, QQmlEngine::CppOwnership);
+    QVERIFY(!obj.called);
+    wrapper.property("callMe").call();
+    QVERIFY(obj.called);
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"