1 files changed, 14 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index b305408..d18bfda 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -61,6 +61,8 @@
 #include <QtCore/qset.h>
 #include <private/qguard_p.h>
 #include <private/qmlengine_p.h>
+#include <private/qmlintegercache_p.h>
+#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -82,17 +84,21 @@ public:
     QmlEngine *engine;
     bool isInternal;
 
-    QHash<QString, int> propertyNames;
+    QmlIntegerCache *propertyNames;
     QList<QVariant> propertyValues;
     int notifyIndex;
 
     QObjectList defaultObjects;
     int highPriorityCount;
 
-    QScriptValueList scopeChain;
+    QScriptValue scriptValue;
+
+    QList<QScriptValue> scripts;
+    void addScript(const QString &script, QObject *scope);
 
     QUrl url;
-    QmlEnginePrivate::Imports imports;
+
+    QmlTypeNameCache *imports;
 
     void init();
 
@@ -125,9 +131,13 @@ public:
     ContextGuard *idValues;
     int idValueCount;
     void setIdProperty(const QString &, int, QObject *);
-    void setIdPropertyCount(int);
+    void setIdPropertyData(QmlIntegerCache *);
     void destroyed(ContextGuard *);
 
+    static QmlContextPrivate *get(QmlContext *context) {
+        return static_cast<QmlContextPrivate *>(QObjectPrivate::get(context));
+    }
+
     // Only used for debugging
     QList<QPointer<QObject> > instances;
 };