Initial import from qtquick2.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index b7e4c6aa7c..29ca091fc2 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -77,7 +77,7 @@ class QDeclarativeEngine;
 class QDeclarativeExpression;
 class QDeclarativeExpressionPrivate;
 class QDeclarativeAbstractExpression;
-class QDeclarativeCompiledBindings;
+class QDeclarativeV4Bindings;
 class QDeclarativeContextData;
 
 class QDeclarativeContextPrivate : public QObjectPrivate
@@ -124,7 +124,7 @@ public:
     QDeclarativeContextData *parent;
     QDeclarativeEngine *engine;
 
-    void setParent(QDeclarativeContextData *);
+    void setParent(QDeclarativeContextData *, bool parentTakesOwnership = false);
     void refreshExpressions();
 
     void addObject(QObject *);
@@ -135,7 +135,9 @@ public:
     // If internal is false publicContext owns this.
     QDeclarativeContext *asQDeclarativeContext();
     QDeclarativeContextPrivate *asQDeclarativeContextPrivate();
-    bool isInternal;
+    quint32 isInternal:1;
+    quint32 ownedByParent:1; // unrelated to isInternal; parent context deletes children if true.
+    quint32 dummy:30;
     QDeclarativeContext *publicContext;
 
     // Property name cache
@@ -146,7 +148,6 @@ public:
 
     // Any script blocks that exist on this context
     QList<QScriptValue> importedScripts;
-    void addImportedScript(const QDeclarativeParser::Object::ScriptBlock &script);
 
     // Context base url
     QUrl url;
@@ -188,7 +189,7 @@ public:
     void setIdPropertyData(QDeclarativeIntegerCache *);
 
     // Optimized binding pointer
-    QDeclarativeCompiledBindings *optimizedBindings;
+    QDeclarativeV4Bindings *optimizedBindings;
 
     // Linked contexts. this owns linkedContext.
     QDeclarativeContextData *linkedContext;