diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-03-01 11:34:10 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-03-01 19:57:12 +0100 |
commit | 09ae67f6270adcb69c06ce77d78b4cba2f1e447e (patch) | |
tree | 767081dc5e626e3244d79d02cdaedaaf103f30e0 /src/qml/qml/qqmlimport.cpp | |
parent | b0fa92ddb6c7c2162571452beec680e0bdfc687c (diff) |
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>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
-rw-r--r-- | src/qml/qml/qqmlimport.cpp | 22 |
1 files changed, 8 insertions, 14 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(); |