Revert "Revise QQmlProxyMetaObject and extension chain creation"

This reverts commit ff0b9ec6bf817f741e3c9fefbfcd55592e9b2542.

Reason for revert: QTBUG-103881

Change-Id: I7e333ec854e81fb06f1f84b77125edc78bb181e6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 1 insertions, 10 deletions

diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index f92548efb7..bcc6a9d9eb 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -1836,12 +1836,8 @@ class ExtendedInParent : public MultiExtensionParent
     QML_ELEMENT
     // properties from base type: p, c, f
     // properties from base type's extension: a, c, d, f, g
-
-    Q_PROPERTY(int c READ c CONSTANT) // overwrite base type extension's property
 public:
     ExtendedInParent(QObject *parent = nullptr) : MultiExtensionParent(parent) { }
-
-    int c() { return 1111; }
 };
 
 class ExtendedByIndirect : public QObject
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 83dd6a55c6..73f886e217 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -6509,14 +6509,9 @@ void tst_qqmllanguage::extensionSpecial()
         QVERIFY2(c.isReady(), qPrintable(c.errorString()));
         QScopedPointer<QObject> o(c.create());
         QVERIFY(o);
+
         // property a exists only in the extension type
         QCOMPARE(o->property("a").toInt(), int('a'));
-        // property c exists on the leaf type and that should be prioritized
-        // over the base type extension's one
-        QCOMPARE(o->property("c").toInt(), 1111);
-
-        o->setProperty("objectName", u"foobar"_s);
-        QCOMPARE(o->property("objectName").toString(), u"foobar"_s);
     }
 
     {