Handle QmlParserStatus's and QmlBindableValeus being deleted during component creation

1 files changed, 29 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 63df0ba..9402fa9 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -107,8 +107,35 @@ public:
 
     QScriptEngine scriptEngine;
 
-    QList<QmlBindableValue *> currentBindValues;
-    QList<QmlParserStatus *> currentParserStatus;
+    template<class T>
+    struct SimpleList {
+        SimpleList()
+            : count(0), values(0) {}
+        SimpleList(int r)
+            : count(0), values(new T*[r]) {}
+
+        int count;
+        T **values;
+
+        void append(T *v) {
+            values[count++] = v;
+        }
+
+        T *at(int idx) const {
+            return values[idx];
+        }
+
+        void clear() {
+            delete [] values;
+        }
+    };
+
+    static void clear(SimpleList<QmlBindableValue> &);
+    static void clear(SimpleList<QmlParserStatus> &);
+
+    QList<SimpleList<QmlBindableValue> > bindValues;
+    QList<SimpleList<QmlParserStatus> > parserStatus;
+
     QmlComponent *rootComponent;
     mutable QNetworkAccessManager *networkAccessManager;