Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I507e252f9cb11b75dd9f7f409c39d93094e8c3ef

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp b/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
index 0f4bb5cdcc..41850d0263 100644
--- a/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
+++ b/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
@@ -82,6 +82,7 @@ private slots:
     void then_fulfilled_non_callable();
     void then_reject_non_callable();
     void then_resolve_multiple_then();
+    void promiseChain();
 
 private:
     void execute_test(QString testName);
@@ -270,6 +271,20 @@ void tst_qqmlpromise::execute_test(QString testName)
     QTRY_COMPARE(object->property("wasTestSuccessful").toBool(), true);
 }
 
+void tst_qqmlpromise::promiseChain()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("promisechain.qml"));
+    QVERIFY(component.isReady());
+    QTest::ignoreMessage(QtDebugMsg, "1");
+    QTest::ignoreMessage(QtDebugMsg, "2");
+    QTest::ignoreMessage(QtDebugMsg, "3");
+    QScopedPointer<QObject> root(component.create());
+    QVERIFY(root);
+    QTRY_VERIFY(root->property("x") == 42);
+
+}
+
 
 QTEST_MAIN(tst_qqmlpromise)