4 files changed, 148 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
index 7fa4bbde44..bdfe81a1ac 100644
--- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
+++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(cpp_sources
     birthdayparty.cpp birthdayparty.h
     cppbaseclass.h
+    dynamicmeta.h
     objectwithmethod.h
     person.cpp person.h
     theme.cpp theme.h
@@ -61,6 +62,7 @@ set(qml_files
     excessiveParameters.qml
     extendedTypes.qml
     failures.qml
+    fallbacklookups.qml
     fileDialog.qml
     functionLookup.qml
     funcWithParams.qml
diff --git a/tests/auto/qml/qmlcppcodegen/data/dynamicmeta.h b/tests/auto/qml/qmlcppcodegen/data/dynamicmeta.h
new file mode 100644
index 0000000000..3f02e460e7
--- /dev/null
+++ b/tests/auto/qml/qmlcppcodegen/data/dynamicmeta.h
@@ -0,0 +1,78 @@
+#ifndef DYNAMICMETA_H
+#define DYNAMICMETA_H
+
+#include <private/qobject_p.h>
+#include <QtQmlIntegration/qqmlintegration.h>
+
+struct FreeDeleter {
+    void operator()(QMetaObject *meta) { free(meta); }
+};
+
+template<typename T>
+class MetaObjectData : public QDynamicMetaObjectData
+{
+    Q_DISABLE_COPY_MOVE(MetaObjectData)
+public:
+    MetaObjectData() = default;
+    ~MetaObjectData() = default;
+
+    QMetaObject *toDynamicMetaObject(QObject *) override
+    {
+        return const_cast<QMetaObject *>(&T::staticMetaObject);
+    }
+    int metaCall(QObject *o, QMetaObject::Call call, int idx, void **argv) override
+    {
+        return o->qt_metacall(call, idx, argv);
+    }
+};
+
+class DynamicMeta : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int foo READ foo WRITE setFoo NOTIFY fooChanged FINAL)
+    QML_ELEMENT
+public:
+
+    DynamicMeta(QObject *parent = nullptr)
+        : QObject(parent)
+    {
+        // deletes itself
+        QObjectPrivate::get(this)->metaObject = new MetaObjectData<DynamicMeta>;
+    }
+
+    int foo() const { return m_foo; }
+    void setFoo(int newFoo)
+    {
+        if (m_foo != newFoo) {
+            m_foo = newFoo;
+            emit fooChanged();
+        }
+    }
+
+    Q_INVOKABLE int bar(int baz) { return baz + 12; }
+
+Q_SIGNALS:
+    void fooChanged();
+
+private:
+    int m_foo = 0;
+};
+
+class DynamicMetaSingleton : public DynamicMeta
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+    Q_PROPERTY(DynamicMetaSingleton *itself READ itself CONSTANT FINAL)
+public:
+    DynamicMetaSingleton(QObject *parent = nullptr) : DynamicMeta(parent)
+    {
+        QObjectPrivate *d = QObjectPrivate::get(this);
+        delete d->metaObject;
+        d->metaObject = new MetaObjectData<DynamicMetaSingleton>;
+    }
+
+    DynamicMetaSingleton *itself() { return this; }
+};
+
+#endif // DYNAMICMETA_H
diff --git a/tests/auto/qml/qmlcppcodegen/data/fallbacklookups.qml b/tests/auto/qml/qmlcppcodegen/data/fallbacklookups.qml
new file mode 100644
index 0000000000..4b58cd344d
--- /dev/null
+++ b/tests/auto/qml/qmlcppcodegen/data/fallbacklookups.qml
@@ -0,0 +1,34 @@
+import TestTypes
+import QtQml
+
+DynamicMeta {
+    id: self
+
+    function getSingleton(): QtObject {
+        return DynamicMetaSingleton.itself
+    }
+
+    function withContext(): int {
+        foo = 93;
+        objectName = "aa" + foo;
+        return bar(4);
+    }
+
+    function withId(): int {
+        self.foo = 94;
+        self.objectName = "bb" + foo;
+        return self.bar(5);
+    }
+
+    function withSingleton(): int {
+        DynamicMetaSingleton.foo = 95;
+        DynamicMetaSingleton.objectName = "cc" + DynamicMetaSingleton.foo;
+        return DynamicMetaSingleton.bar(6);
+    }
+
+    function withProperty(): int {
+        DynamicMetaSingleton.itself.foo = 96;
+        DynamicMetaSingleton.itself.objectName = "dd" + DynamicMetaSingleton.itself.foo;
+        return DynamicMetaSingleton.itself.bar(7);
+    }
+}
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
index 863380f517..74794eb7fc 100644
--- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
+++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
@@ -125,6 +125,7 @@ private slots:
     void objectInVar();
     void functionTakingVar();
     void testIsnan();
+    void fallbackLookups();
 };
 
 void tst_QmlCppCodegen::simpleBinding()
@@ -1870,6 +1871,39 @@ void tst_QmlCppCodegen::testIsnan()
     QVERIFY(b.toBool());
 }
 
+void tst_QmlCppCodegen::fallbackLookups()
+{
+    QQmlEngine engine;
+    const QUrl document(u"qrc:/TestTypes/fallbacklookups.qml"_qs);
+    QQmlComponent c(&engine, document);
+    QVERIFY2(c.isReady(), qPrintable(c.errorString()));
+    QScopedPointer<QObject> o(c.create());
+    QVERIFY(o);
+
+    QCOMPARE(o->objectName(), QString());
+    int result = 0;
+
+    QMetaObject::invokeMethod(o.data(), "withContext", Q_RETURN_ARG(int, result));
+    QCOMPARE(result, 16);
+    QCOMPARE(o->objectName(), QStringLiteral("aa93"));
+
+    QMetaObject::invokeMethod(o.data(), "withId", Q_RETURN_ARG(int, result));
+    QCOMPARE(result, 17);
+    QCOMPARE(o->objectName(), QStringLiteral("bb94"));
+
+    QObject *singleton = nullptr;
+    QMetaObject::invokeMethod(o.data(), "getSingleton", Q_RETURN_ARG(QObject*, singleton));
+    QVERIFY(singleton);
+
+    QMetaObject::invokeMethod(o.data(), "withSingleton", Q_RETURN_ARG(int, result));
+    QCOMPARE(result, 18);
+    QCOMPARE(singleton->objectName(), QStringLiteral("cc95"));
+
+    QMetaObject::invokeMethod(o.data(), "withProperty", Q_RETURN_ARG(int, result));
+    QCOMPARE(result, 19);
+    QCOMPARE(singleton->objectName(), QStringLiteral("dd96"));
+}
+
 void tst_QmlCppCodegen::runInterpreted()
 {
     if (qEnvironmentVariableIsSet("QV4_FORCE_INTERPRETER"))