diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-11-06 13:20:09 -0600 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2017-11-08 14:04:04 +0000 |
| commit | 34992750d7d35086e26067fba14098f24caca4d3 (patch) | |
| tree | 11cbde5c013a184865cf5f4b091fc4237ababd87 | |
| parent | 853b4b08d54f70d04d371d707e50760ffecf2f77 (diff) | |
Check for duplication with url rather than uri
We might have duplicated uris with different paths. This comparison
is meant to check for multiple imports of the same path.
Change-Id: I2d99728d32116453ae92a152337d2627c2653b79
Task-number: QTBUG-64237
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index a85166da65..334bc8b28e 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1539,7 +1539,7 @@ bool QQmlImportsPrivate::addFileImport(const QString& uri, const QString &prefix if (isImplicitImport) { for (QList<QQmlImportInstance *>::const_iterator it = nameSpace->imports.constBegin(); it != nameSpace->imports.constEnd(); ++it) { - if ((*it)->uri == importUri) { + if ((*it)->url == url) { (*it)->implicitlyImported = true; return true; } |