Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 5 insertions, 4 deletions

diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index d96a43e..d23b4ea 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -117,8 +117,10 @@ namespace QmlParser
         QUrl url;
         // The name of this type
         QByteArray typeName;
-        // The id assigned to the object (if any).
-        QByteArray id;
+        // The id assigned to the object (if any).  Set by the QmlCompiler
+        QString id;
+        // The id index assigned to the object (if any).  Set by the QmlCompiler
+        int idIndex;
         // Custom parsed data
         QByteArray custom;
         // Returns the metaobject for this type, or 0 if not available.  
@@ -129,7 +131,6 @@ namespace QmlParser
         const QMetaObject *metatype;
         // The synthesized metaobject, if QML added signals or properties to
         // this type.  Otherwise null
-        QMetaObject *extObjectData;
         QAbstractDynamicMetaObject extObject;
         QByteArray metadata; // Generated by compiler
         QByteArray synthdata; // Generated by compiler
@@ -168,7 +169,7 @@ namespace QmlParser
             Type type;
             QByteArray name;
             QmlParser::Property *defaultValue;
-            LocationRange range;
+            LocationSpan location;
         };
         struct DynamicSignal {
             DynamicSignal();