2 files changed, 0 insertions, 17 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index b8212ee6cf..5eb6fe286a 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -1565,16 +1565,6 @@ int TestObject::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
         _id -= ownPropertyCount;
     } else if (_c == QMetaObject::ResetProperty) {
         _id -= ownPropertyCount;
-    } else if (_c == QMetaObject::QueryPropertyDesignable) {
-        _id -= ownPropertyCount;
-    } else if (_c == QMetaObject::QueryPropertyScriptable) {
-        _id -= ownPropertyCount;
-    } else if (_c == QMetaObject::QueryPropertyStored) {
-        _id -= ownPropertyCount;
-    } else if (_c == QMetaObject::QueryPropertyEditable) {
-        _id -= ownPropertyCount;
-    } else if (_c == QMetaObject::QueryPropertyUser) {
-        _id -= ownPropertyCount;
     }
 #endif // QT_NO_PROPERTIES
     return _id;
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 960164dac4..37d3cc130f 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -620,7 +620,6 @@ class tst_Moc : public QObject
 
     Q_PROPERTY(bool user1 READ user1 USER true )
     Q_PROPERTY(bool user2 READ user2 USER false)
-    Q_PROPERTY(bool user3 READ user3 USER userFunction())
     Q_PROPERTY(QString member1 MEMBER sMember)
     Q_PROPERTY(QString member2 MEMBER sMember READ member2)
     Q_PROPERTY(QString member3 MEMBER sMember WRITE setMember3)
@@ -744,8 +743,6 @@ signals:
 private:
     bool user1() { return true; };
     bool user2() { return false; };
-    bool user3() { return false; };
-    bool userFunction(){ return false; };
     template <class T> void revisions_T();
     QString member2() const { return sMember; }
     void setMember3( const QString &sVal ) { sMember = sVal; }
@@ -919,10 +916,6 @@ void tst_Moc::userProperties()
     property = mobj->property(mobj->indexOfProperty("user2"));
     QVERIFY(property.isValid());
     QVERIFY(!property.isUser());
-
-    property = mobj->property(mobj->indexOfProperty("user3"));
-    QVERIFY(property.isValid());
-    QVERIFY(!property.isUser(this));
 }
 
 void tst_Moc::supportConstSignals()