Give the QJSValuePrivate the pointer to the engine back

Unfortunately the value needs a pointer back to the engine, to keep
compatibility with the old code and have our tests pass unmodified.

Change-Id: Ibe26e6c770bd8d26dad4a26d42b40e3e1af4996c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 12 insertions, 4 deletions

diff --git a/src/qml/qml/v8/qjsvalue_p.h b/src/qml/qml/v8/qjsvalue_p.h
index db30ad8c92..cf1148f54e 100644
--- a/src/qml/qml/v8/qjsvalue_p.h
+++ b/src/qml/qml/v8/qjsvalue_p.h
@@ -57,6 +57,7 @@
 #include <private/qv4value_p.h>
 #include <private/qv4string_p.h>
 #include <private/qv4engine_p.h>
+#include <private/qv4object_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -67,38 +68,45 @@ QT_BEGIN_NAMESPACE
 class QJSValuePrivate : public QV4::PersistentValuePrivate
 {
 public:
-    QJSValuePrivate(const QV4::Value &v)
+    QJSValuePrivate(QV4::ExecutionEngine *engine, const QV4::Value &v)
         : PersistentValuePrivate(v)
+        , e(engine)
     {
         if (value.isEmpty())
             value = QV4::Value::undefinedValue();
     }
     QJSValuePrivate(QV4::Object *o)
         : PersistentValuePrivate(QV4::Value::fromObject(o))
-    {}
+    { e = o->engine(); }
     QJSValuePrivate(QV4::String *s)
         : PersistentValuePrivate(QV4::Value::fromString(s))
-    {}
+    { e = s->engine(); }
     QJSValuePrivate(const QString &s)
         : PersistentValuePrivate(QV4::Value::undefinedValue())
         , string(0, s)
+        , e(0)
     {
         value = QV4::Value::fromString(&string);
     }
 
     QV4::Value getValue(QV4::ExecutionEngine *e) {
+        if (!this->e)
+            this->e = e;
         if (value.asString() == &string)
             value = QV4::Value::fromString(e->newString(string.toQString()));
         return value;
     }
 
     QV4::ExecutionEngine *engine() const {
-        return value.engine();
+        if (!e)
+            e = value.engine();
+        return e;
     }
 
     static QJSValuePrivate *get(const QJSValue &v) { return v.d; }
 
     QV4::String string;
+    mutable QV4::ExecutionEngine *e;
 };
 
 QT_END_NAMESPACE