QQmlImport: Fix naming of qmldir location

pluginLocation() was rather misleading. Also, resolve the location
inside importExtension().

Change-Id: I4286fbcb1ecd7641106ea0ef67fd9b6e59c8e492
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

3 files changed, 10 insertions, 16 deletions

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 1ac2057b98..535b6713ba 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -315,9 +315,8 @@ public:
             QTypeRevision version, QList<QQmlError> *errors);
 
     QTypeRevision importExtension(
-            const QString &absoluteFilePath, const QString &uri, QTypeRevision version,
-            QQmlImportDatabase *database, const QQmlTypeLoaderQmldirContent &qmldir,
-            QList<QQmlError> *errors);
+            const QString &uri, QTypeRevision version, QQmlImportDatabase *database,
+            const QQmlTypeLoaderQmldirContent &qmldir, QList<QQmlError> *errors);
 
     bool getQmldirContent(const QString &qmldirIdentifier, const QString &uri,
                           QQmlTypeLoaderQmldirContent *qmldir, QList<QQmlError> *errors);
@@ -1192,16 +1191,14 @@ bool QQmlImportsPrivate::populatePluginPairVector(QVector<StaticPluginPair> &res
 
 /*
 Import an extension defined by a qmldir file.
-
-\a qmldirFilePath is a raw file path.
 */
 QTypeRevision QQmlImportsPrivate::importExtension(
-        const QString &qmldirFilePath, const QString &uri, QTypeRevision version,
-        QQmlImportDatabase *database, const QQmlTypeLoaderQmldirContent &qmldir,
-        QList<QQmlError> *errors)
+        const QString &uri, QTypeRevision version, QQmlImportDatabase *database,
+        const QQmlTypeLoaderQmldirContent &qmldir, QList<QQmlError> *errors)
 {
     Q_ASSERT(qmldir.hasContent());
 
+    const QString qmldirFilePath = qmldir.qmldirLocation();
     if (qmlImportTrace())
         qDebug().nospace() << "QQmlImports(" << qPrintable(base) << ")::importExtension: "
                            << "loaded " << qmldirFilePath;
@@ -1624,8 +1621,7 @@ QTypeRevision QQmlImportsPrivate::addLibraryImport(
                 return QTypeRevision();
 
             if (qmldir.hasContent()) {
-                version = importExtension(
-                            qmldir.pluginLocation(), uri, version, database, qmldir, errors);
+                version = importExtension(uri, version, database, qmldir, errors);
                 if (!version.isValid())
                     return QTypeRevision();
 
@@ -1744,8 +1740,7 @@ QTypeRevision QQmlImportsPrivate::addFileImport(
             return QTypeRevision();
 
         if (qmldir.hasContent()) {
-            version = importExtension(
-                        qmldir.pluginLocation(), importUri, version, database, qmldir, errors);
+            version = importExtension(importUri, version, database, qmldir, errors);
             if (!version.isValid())
                 return QTypeRevision();
 
@@ -1770,8 +1765,7 @@ QTypeRevision QQmlImportsPrivate::updateQmldirContent(const QString &uri, const
             return QTypeRevision();
 
         if (qmldir.hasContent()) {
-            QTypeRevision version = importExtension(
-                        qmldir.pluginLocation(), uri, import->version, database, qmldir, errors);
+            QTypeRevision version = importExtension(uri, import->version, database, qmldir, errors);
             if (!version.isValid())
                 return QTypeRevision();
 
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent.cpp b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
index 2175c115e6..0eddf796d7 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent.cpp
+++ b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
@@ -110,7 +110,7 @@ QQmlDirImports QQmlTypeLoaderQmldirContent::imports() const
     return m_parser.imports();
 }
 
-QString QQmlTypeLoaderQmldirContent::pluginLocation() const
+QString QQmlTypeLoaderQmldirContent::qmldirLocation() const
 {
     return m_location;
 }
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent_p.h b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
index 677d06891e..f9b68f3410 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent_p.h
+++ b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
@@ -80,7 +80,7 @@ public:
     QQmlDirPlugins plugins() const;
     QQmlDirImports imports() const;
 
-    QString pluginLocation() const;
+    QString qmldirLocation() const;
 
     bool designerSupported() const;