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/qqmlscriptblob.cpp | |
| 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/qqmlscriptblob.cpp')
| -rw-r--r-- | src/qml/qml/qqmlscriptblob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlscriptblob.cpp b/src/qml/qml/qqmlscriptblob.cpp index 4ca506a926..7b7a842d04 100644 --- a/src/qml/qml/qqmlscriptblob.cpp +++ b/src/qml/qml/qqmlscriptblob.cpp @@ -234,7 +234,7 @@ void QQmlScriptBlob::initializeFromCompilationUnit(const QQmlRefPointer<QV4::Exe QList<QQmlError> errors; for (quint32 i = 0, count = script->importCount(); i < count; ++i) { const QV4::CompiledData::Import *import = script->importAt(i); - if (!addImport(import, &errors)) { + if (!addImport(import, {}, &errors)) { Q_ASSERT(errors.size()); QQmlError error(errors.takeFirst()); error.setUrl(m_importCache.baseUrl()); |