Improve implicit "." import

The change moves the implicit "." import to the very end, i.e.
the first lookup. It also gets the content of a remote qmldir
from the resources.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 4449404..ce4a9f1 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1587,6 +1587,8 @@ public:
             }
 
             url = base.resolved(QUrl(url)).toString();
+            if (url.endsWith(QLatin1Char('/')))
+                url.chop(1);
         }
 
         s->uris.prepend(uri);
@@ -1623,6 +1625,11 @@ public:
             }
 
         }
+
+
+        /* now comes really nasty code. It makes "private" types load in the remote case, but
+           it does this by breaking the import order. This must go. Instead private types must
+           be marked private in the qmldir. */
         if (url_return) {
             *url_return = base.resolved(QUrl(QString::fromUtf8(type + ".qml")));
             return true;