1 files changed, 93 insertions, 16 deletions

diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index f765440e71..47cc30bd04 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -147,6 +147,7 @@ private slots:
     void singleShotConnection();
     void objectNameBinding();
     void emitToDestroyedClass();
+    void declarativeData();
 };
 
 struct QObjectCreatedOnShutdown
@@ -959,7 +960,7 @@ void tst_QObject::disconnectNotify_receiverDestroyed()
         QVERIFY(QObject::connect((SenderObject *)&s, SIGNAL(signal1()),
                                  (ReceiverObject *)&r, SLOT(slot1())));
     }
-    QCOMPARE(s.disconnectedSignals.count(), 1);
+    QCOMPARE(s.disconnectedSignals.size(), 1);
     QCOMPARE(s.disconnectedSignals.at(0), QMetaMethod::fromSignal(&SenderObject::signal1));
 
     s.disconnectedSignals.clear();
@@ -970,7 +971,7 @@ void tst_QObject::disconnectNotify_receiverDestroyed()
                                  (ReceiverObject *)&r, SLOT(slot3())));
     }
 
-    QCOMPARE(s.disconnectedSignals.count(), 1);
+    QCOMPARE(s.disconnectedSignals.size(), 1);
     QCOMPARE(s.disconnectedSignals.at(0), QMetaMethod::fromSignal(&SenderObject::signal3));
 
     s.disconnectedSignals.clear();
@@ -980,7 +981,7 @@ void tst_QObject::disconnectNotify_receiverDestroyed()
         QVERIFY(QObject::connect((SenderObject *)&s, SIGNAL(destroyed()), (ReceiverObject *)&r, SLOT(slot3())));
     }
 
-    QCOMPARE(s.disconnectedSignals.count(), 1);
+    QCOMPARE(s.disconnectedSignals.size(), 1);
     QCOMPARE(s.disconnectedSignals.at(0), QMetaMethod::fromSignal(&QObject::destroyed));
 }
 
@@ -995,10 +996,10 @@ void tst_QObject::disconnectNotify_metaObjConnection()
         QVERIFY(c);
         QVERIFY(QObject::disconnect(c));
 
-        QCOMPARE(s.disconnectedSignals.count(), 1);
+        QCOMPARE(s.disconnectedSignals.size(), 1);
         QCOMPARE(s.disconnectedSignals.at(0), QMetaMethod::fromSignal(&SenderObject::signal1));
 
-        QCOMPARE(s.disconnectedSignals.count(), 1);
+        QCOMPARE(s.disconnectedSignals.size(), 1);
     }
 }
 
@@ -2124,18 +2125,18 @@ void tst_QObject::metamethod()
     QVERIFY(!(m.attributes() & QMetaMethod::Compatibility));
 
     m = mobj->method(mobj->indexOfMethod("invoke1()"));
-    QCOMPARE(m.parameterNames().count(), 0);
-    QCOMPARE(m.parameterTypes().count(), 0);
+    QCOMPARE(m.parameterNames().size(), 0);
+    QCOMPARE(m.parameterTypes().size(), 0);
 
     m = mobj->method(mobj->indexOfMethod("invoke2(int)"));
-    QCOMPARE(m.parameterNames().count(), 1);
-    QCOMPARE(m.parameterTypes().count(), 1);
+    QCOMPARE(m.parameterNames().size(), 1);
+    QCOMPARE(m.parameterTypes().size(), 1);
     QCOMPARE(m.parameterTypes().at(0), QByteArray("int"));
     QVERIFY(m.parameterNames().at(0).isEmpty());
 
     m = mobj->method(mobj->indexOfMethod("invoke3(int,int)"));
-    QCOMPARE(m.parameterNames().count(), 2);
-    QCOMPARE(m.parameterTypes().count(), 2);
+    QCOMPARE(m.parameterNames().size(), 2);
+    QCOMPARE(m.parameterTypes().size(), 2);
     QCOMPARE(m.parameterTypes().at(0), QByteArray("int"));
     QCOMPARE(m.parameterNames().at(0), QByteArray("hinz"));
     QCOMPARE(m.parameterTypes().at(1), QByteArray("int"));
@@ -2950,22 +2951,22 @@ void tst_QObject::dynamicProperties()
 
     // set a dynamic property
     QVERIFY(!obj.setProperty("myuserproperty", "Hello"));
-    QCOMPARE(obj.changedDynamicProperties.count(), 1);
+    QCOMPARE(obj.changedDynamicProperties.size(), 1);
     QCOMPARE(obj.changedDynamicProperties.first(), QByteArray("myuserproperty"));
     //check if there is no redundant DynamicPropertyChange events
     QVERIFY(!obj.setProperty("myuserproperty", "Hello"));
-    QCOMPARE(obj.changedDynamicProperties.count(), 1);
+    QCOMPARE(obj.changedDynamicProperties.size(), 1);
 
     QCOMPARE(obj.property("myuserproperty").type(), QVariant::String);
     QCOMPARE(obj.property("myuserproperty").toString(), QString("Hello"));
 
-    QCOMPARE(obj.dynamicPropertyNames().count(), 1);
+    QCOMPARE(obj.dynamicPropertyNames().size(), 1);
     QCOMPARE(obj.dynamicPropertyNames().first(), QByteArray("myuserproperty"));
 
     // change type of the dynamic property
     obj.changedDynamicProperties.clear();
     QVERIFY(!obj.setProperty("myuserproperty", QByteArray("Hello")));
-    QCOMPARE(obj.changedDynamicProperties.count(), 1);
+    QCOMPARE(obj.changedDynamicProperties.size(), 1);
     QCOMPARE(obj.changedDynamicProperties.first(), QByteArray("myuserproperty"));
     QCOMPARE(obj.property("myuserproperty").type(), QVariant::ByteArray);
     QCOMPARE(obj.property("myuserproperty").toString(), QByteArray("Hello"));
@@ -2974,7 +2975,7 @@ void tst_QObject::dynamicProperties()
     obj.changedDynamicProperties.clear();
     QVERIFY(!obj.setProperty("myuserproperty", QVariant()));
 
-    QCOMPARE(obj.changedDynamicProperties.count(), 1);
+    QCOMPARE(obj.changedDynamicProperties.size(), 1);
     QCOMPARE(obj.changedDynamicProperties.first(), QByteArray("myuserproperty"));
     obj.changedDynamicProperties.clear();
 
@@ -8241,5 +8242,81 @@ signals:
     void aSignal5(const std::unique_ptr<const QObject> &);
 };
 
+#ifdef QT_BUILD_INTERNAL
+/*
+    Since QObjectPrivate stores the declarativeData pointer in a union with the pointer
+    to the currently destroyed child, calls to the QtDeclarative handlers need to be
+    correctly guarded. QTBUG-105286
+*/
+namespace QtDeclarative {
+static QAbstractDeclarativeData *theData;
+
+static void destroyed(QAbstractDeclarativeData *data, QObject *)
+{
+    QCOMPARE(data, theData);
+}
+static void signalEmitted(QAbstractDeclarativeData *data, QObject *, int, void **)
+{
+    QCOMPARE(data, theData);
+}
+// we can't use QCOMPARE in the next two functions, as they don't return void
+static int receivers(QAbstractDeclarativeData *data, const QObject *, int)
+{
+    QTest::qCompare(data, theData, "data", "theData", __FILE__, __LINE__);
+    return 0;
+}
+static bool isSignalConnected(QAbstractDeclarativeData *data, const QObject *, int)
+{
+    QTest::qCompare(data, theData, "data", "theData", __FILE__, __LINE__);
+    return true;
+}
+
+class Object : public QObject
+{
+    Q_OBJECT
+public:
+    using QObject::QObject;
+    ~Object()
+    {
+        if (Object *p = static_cast<Object *>(parent()))
+            p->emitSignal();
+    }
+
+    void emitSignal()
+    {
+        emit theSignal();
+    }
+
+signals:
+    void theSignal();
+};
+
+}
+#endif
+
+void tst_QObject::declarativeData()
+{
+#ifdef QT_BUILD_INTERNAL
+    QScopedValueRollback destroyed(QAbstractDeclarativeData::destroyed,
+                                   QtDeclarative::destroyed);
+    QScopedValueRollback signalEmitted(QAbstractDeclarativeData::signalEmitted,
+                                       QtDeclarative::signalEmitted);
+    QScopedValueRollback receivers(QAbstractDeclarativeData::receivers,
+                                   QtDeclarative::receivers);
+    QScopedValueRollback isSignalConnected(QAbstractDeclarativeData::isSignalConnected,
+                                           QtDeclarative::isSignalConnected);
+
+    QtDeclarative::Object p;
+    QObjectPrivate *priv = QObjectPrivate::get(&p);
+    priv->declarativeData = QtDeclarative::theData = new QAbstractDeclarativeData;
+
+    connect(&p, &QtDeclarative::Object::theSignal, &p, []{
+    });
+
+    QtDeclarative::Object *child = new QtDeclarative::Object;
+    child->setParent(&p);
+#endif
+}
+
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"