Use finalUrl in QQmlTypeLoader::Blob::addPragma to fix a bug.

There was a bug in addPragma where url() was being used instead of
finalUrl(). This resulted in an error finding the type if selectors
were used. This patch includes the fix and adds a unit test to cover
the use case.

Change-Id: I18b6c73e96af2e1464931de76f1f8fd804746d82
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index d7ba157f94..eb565babf4 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1341,7 +1341,7 @@ bool QQmlTypeLoader::Blob::addPragma(const QQmlScript::Pragma &pragma, QList<QQm
     Q_ASSERT(errors);
 
     if (pragma.type == QQmlScript::Pragma::Singleton) {
-        QUrl myUrl = url();
+        QUrl myUrl = finalUrl();
 
         QQmlType *ret = QQmlMetaType::qmlType(myUrl, true);
         if (!ret) {
@@ -1369,7 +1369,7 @@ bool QQmlTypeLoader::Blob::addPragma(const QQmlScript::Pragma &pragma, QList<QQm
     } else {
         QQmlError error;
         error.setDescription(QLatin1String("Invalid pragma"));
-        error.setUrl(url());
+        error.setUrl(finalUrl());
         error.setLine(pragma.location.start.line);
         error.setColumn(pragma.location.start.column);
         errors->prepend(error);
@@ -2086,7 +2086,7 @@ void QQmlTypeData::done()
     // If the type is CompositeSingleton but there was no pragma Singleton in the
     // QML file, lets report an error.
     QQmlType *type = QQmlMetaType::qmlType(url(), true);
-    if (type && type->isCompositeSingleton() && !m_isSingleton) {
+    if (!isError() && type && type->isCompositeSingleton() && !m_isSingleton) {
         QString typeName = type->qmlTypeName();
 
         QQmlError error;