Fix local type lookup

This change removes the hacky final baseUrl+TypeName+".qml" lookup.
In order to still support internal files in remote modules, a new
qmldir keyword "internal" is introduced.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/declarative/qml/qdeclarativedirparser_p.h b/src/declarative/qml/qdeclarativedirparser_p.h
index 5df7117..295fa66 100644
--- a/src/declarative/qml/qdeclarativedirparser_p.h
+++ b/src/declarative/qml/qdeclarativedirparser_p.h
@@ -94,15 +94,17 @@ public:
     struct Component
     {
         Component()
-            : majorVersion(0), minorVersion(0) {}
+            : majorVersion(0), minorVersion(0), internal(false) {}
 
         Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
-            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
+            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion),
+            internal(false) {}
 
         QString typeName;
         QString fileName;
         int majorVersion;
         int minorVersion;
+        bool internal;
     };
 
     QList<Component> components() const;