diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-04 15:47:50 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-11 18:06:53 +0200 |
| commit | 8311d0135ed27b457144bfa0b9587f12cf17b364 (patch) | |
| tree | b96fc9e18cd9ca9864cfb118a37887d7b15bc5db /src/qml/qml/qqmltypeloader_p.h | |
| parent | 11a09e212877988d37416842ad73d9aa357ba51f (diff) | |
QML: Fix precedence of module imports
Types imported transitively via a qmldir import statement should not
shadow types available from the module itself.
Change-Id: Id34edc5c5e2fff4ba37009f4bab9039b7ed18dff
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index 094360a51b..eb6e549911 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -109,8 +109,9 @@ public: using PendingImportPtr = std::shared_ptr<PendingImport>; protected: - bool addImport(const QV4::CompiledData::Import *import, QList<QQmlError> *errors); - bool addImport(PendingImportPtr import, QList<QQmlError> *errors); + bool addImport(const QV4::CompiledData::Import *import, uint flags, + QList<QQmlError> *errors); + bool addImport(PendingImportPtr import, uint flags, QList<QQmlError> *errors); bool fetchQmldir(const QUrl &url, PendingImportPtr import, int priority, QList<QQmlError> *errors); bool updateQmldir(const QQmlRefPointer<QQmlQmldirData> &data, PendingImportPtr import, QList<QQmlError> *errors); |