Initial import from qtquick2.

Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469

1 files changed, 3 insertions, 2 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 93b6a0961e..49bab759be 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -122,7 +122,7 @@ public:
     QList<QScriptValue *> cachedClosures;
     QList<QDeclarativePropertyCache *> propertyCaches;
     QList<QDeclarativeIntegerCache *> contextCaches;
-    QList<QDeclarativeParser::Object::ScriptBlock> scripts;
+    QList<QDeclarativeScriptData *> scripts;
     QList<QUrl> urls;
 
     void dumpInstructions();
@@ -305,11 +305,12 @@ private:
     struct ComponentCompileState
     {
         ComponentCompileState() 
-            : parserStatusCount(0), pushedProperties(0), root(0) {}
+            : parserStatusCount(0), pushedProperties(0), nested(false), root(0) {}
         QHash<QString, QDeclarativeParser::Object *> ids;
         QHash<int, QDeclarativeParser::Object *> idIndexes;
         int parserStatusCount;
         int pushedProperties;
+        bool nested;
 
         QByteArray compiledBindingData;