Share QScriptValue's where possible

Also add an autotest for object comparisons

2 files changed, 12 insertions, 1 deletions

diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h
index b4c87b8..f6ecc3d 100644
--- a/src/declarative/qml/qmldeclarativedata_p.h
+++ b/src/declarative/qml/qmldeclarativedata_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <private/qobject_p.h>
+#include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -86,6 +87,7 @@ public:
 
     QHash<int, QObject *> *attachedProperties;
 
+    QScriptValue scriptValue;
     QmlPropertyCache *propertyCache;
 
     static QmlDeclarativeData *get(const QObject *object, bool create = false) {
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 2d5991c..330eddd 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -80,7 +80,16 @@ QScriptValue QmlObjectScriptClass::newQObject(QObject *object)
 {
     QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
 
-    return newObject(scriptEngine, this, new ObjectData(object));
+    QmlDeclarativeData *ddata = QmlDeclarativeData::get(object, true);
+
+    if (!ddata->scriptValue.isValid()) {
+        ddata->scriptValue = newObject(scriptEngine, this, new ObjectData(object));
+        return ddata->scriptValue;
+    } else if (ddata->scriptValue.engine() == QmlEnginePrivate::getScriptEngine(engine)) {
+        return ddata->scriptValue;
+    } else {
+        return newObject(scriptEngine, this, new ObjectData(object));
+    }
 }
 
 QObject *QmlObjectScriptClass::toQObject(const QScriptValue &value) const