Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

1 files changed, 25 insertions, 25 deletions

diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
index c59e5e2..eb8c9eb 100644
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -537,6 +537,31 @@ int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData
     int waiting = 0;
 
 
+    /*
+     For local urls, add an implicit import "." as first (most overridden) lookup. This will also trigger
+     the loading of the qmldir and the import of any native types from available plugins.
+     */
+    {
+
+        QDeclarativeDirComponents qmldircomponentsnetwork;
+        if (QDeclarativeCompositeTypeResource *resource
+            = resources.value(unit->imports.baseUrl().resolved(QUrl(QLatin1String("./qmldir"))))) {
+            QDeclarativeDirParser parser;
+            parser.setSource(QString::fromUtf8(resource->data));
+            parser.parse();
+            qmldircomponentsnetwork = parser.components();
+        }
+
+        QDeclarativeEnginePrivate::get(engine)->
+                addToImport(&unit->imports,
+                            qmldircomponentsnetwork,
+                            QLatin1String("."),
+                            QString(),
+                            -1, -1,
+                            QDeclarativeScriptParser::Import::File,
+                            0); // error ignored (just means no fallback)
+    }
+
 
     foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) {
         QDeclarativeDirComponents qmldircomponentsnetwork;
@@ -587,31 +612,6 @@ int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData
         }
     }
 
-    /*
-     For local urls, add an implicit import "." as first lookup. This will also trigger
-     the loading of the qmldir and the import of any native types from available plugins.
-     */
-    {
-
-        QDeclarativeDirComponents qmldircomponentsnetwork;
-        if (QDeclarativeCompositeTypeResource *resource
-            = resources.value(unit->imports.baseUrl().resolved(QUrl(QLatin1String("./qmldir"))))) {
-            QDeclarativeDirParser parser;
-            parser.setSource(QString::fromUtf8(resource->data));
-            parser.parse();
-            qmldircomponentsnetwork = parser.components();
-        }
-
-        QDeclarativeEnginePrivate::get(engine)->
-                addToImport(&unit->imports,
-                            qmldircomponentsnetwork,
-                            QLatin1String("."),
-                            QString(),
-                            -1, -1,
-                            QDeclarativeScriptParser::Import::File,
-                            0); // error ignored (just means no fallback)
-    }
-
 
     QList<QDeclarativeScriptParser::TypeReference*> types = unit->data.referencedTypes();