Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
index ff3361ff82..1d0d353668 100644
--- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
+++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
@@ -62,6 +62,8 @@ private slots:
     void defaultObject();
     void unregisterCustomType();
     void unregisterCustomSingletonType();
+
+    void normalizeUrls();
 };
 
 class TestType : public QObject
@@ -523,6 +525,18 @@ void tst_qqmlmetatype::unregisterCustomSingletonType()
     }
 }
 
+void tst_qqmlmetatype::normalizeUrls()
+{
+    const QUrl url("qrc:///tstqqmlmetatype/data/CompositeType.qml");
+    QVERIFY(!QQmlMetaType::qmlType(url).isValid());
+    const auto registrationId = qmlRegisterType(url, "Test", 1, 0, "ResourceCompositeType");
+    QVERIFY(QQmlMetaType::qmlType(url, /*includeNonFileImports=*/true).isValid());
+    QUrl normalizedURL("qrc:/tstqqmlmetatype/data/CompositeType.qml");
+    QVERIFY(QQmlMetaType::qmlType(normalizedURL, /*includeNonFileImports=*/true).isValid());
+    qmlUnregisterType(registrationId);
+    QVERIFY(!QQmlMetaType::qmlType(url, /*includeNonFileImports=*/true).isValid());
+}
+
 QTEST_MAIN(tst_qqmlmetatype)
 
 #include "tst_qqmlmetatype.moc"