Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
index 1ed94fcb93..22e9724c61 100644
--- a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
+++ b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
@@ -52,6 +52,7 @@ private slots:
     void rewriteErrors();
     void singletonTypeTarget();
     void enableDisable_QTBUG_36350();
+    void disabledAtStart();
     void clearImplicitTarget();
     void onWithoutASignal();
 
@@ -354,6 +355,23 @@ void tst_qqmlconnections::enableDisable_QTBUG_36350()
     delete item;
 }
 
+void tst_qqmlconnections::disabledAtStart()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("disabled-at-start.qml"));
+    QObject * const object = c.create();
+
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("tested").toBool(), false);
+    const int index = object->metaObject()->indexOfSignal("testMe()");
+    const QMetaMethod method = object->metaObject()->method(index);
+    method.invoke(object, Qt::DirectConnection);
+    QCOMPARE(object->property("tested").toBool(), false);
+
+    delete object;
+}
+
 //QTBUG-56499
 void tst_qqmlconnections::clearImplicitTarget()
 {