1 files changed, 2 insertions, 51 deletions

diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 21615d6ec4..5ce70f7a0e 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -81,9 +81,6 @@ private slots:
     void senderTest();
     void declareInterface();
     void qpointerResetBeforeDestroyedSignal();
-#ifndef QT_NO_USERDATA
-    void testUserData();
-#endif
     void childDeletesItsSibling();
     void dynamicProperties();
     void floatProperty();
@@ -463,7 +460,7 @@ void tst_QObject::connectSlotsByName()
     sender.setObjectName("Sender");
 
     QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: No matching signal for on_child_signal()");
-    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: (\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\")");
+    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: QVector(\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\")");
     QMetaObject::connectSlotsByName(&receiver);
 
     receiver.called_slots.clear();
@@ -2341,51 +2338,6 @@ void tst_QObject::declareInterface()
 
 }
 
-#ifndef QT_NO_USERDATA
-class CustomData : public QObjectUserData
-{
-public:
-    int id;
-};
-
-void tst_QObject::testUserData()
-{
-    const int USER_DATA_COUNT = 100;
-    int user_data_ids[USER_DATA_COUNT];
-
-    // Register a few
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        user_data_ids[i] = QObject::registerUserData();
-    }
-
-    // Randomize the table a bit
-    for (int i=0; i<100; ++i) {
-        int p1 = QRandomGenerator::global()->bounded(USER_DATA_COUNT);
-        int p2 = QRandomGenerator::global()->bounded(USER_DATA_COUNT);
-
-        int tmp = user_data_ids[p1];
-        user_data_ids[p1] = user_data_ids[p2];
-        user_data_ids[p2] = tmp;
-    }
-
-    // insert the user data into an object
-    QObject my_test_object;
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        CustomData *data = new CustomData;
-        data->id = user_data_ids[i];
-        my_test_object.setUserData(data->id, data);
-    }
-
-    // verify that all ids and positions are matching
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        int id = user_data_ids[i];
-        CustomData *data = static_cast<CustomData *>(my_test_object.userData(id));
-        QVERIFY(data != nullptr);
-        QCOMPARE(data->id, id);
-    }
-}
-#endif // QT_NO_USERDATA
-
 class DestroyedListener : public QObject
 {
     Q_OBJECT
@@ -6974,8 +6926,7 @@ void tst_QObject::noDeclarativeParentChangedOnDestruction()
     QObject *parent = new QObject;
     QObject *child = new QObject;
 
-    QAbstractDeclarativeDataImpl dummy;
-    dummy.ownedByQml1 = false;
+    QAbstractDeclarativeData dummy;
     QObjectPrivate::get(child)->declarativeData = &dummy;
 
     parentChangeCalled = false;