From 34992750d7d35086e26067fba14098f24caca4d3 Mon Sep 17 00:00:00 2001
From: Michael Brasser <mbrasser@ford.com>
Date: Mon, 6 Nov 2017 13:20:09 -0600
Subject: 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>
---
 src/qml/qml/qqmlimport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
             }
-- 
cgit v1.2.3