Fix toString and destroy on QObject JS bindings

The auto-tests requires these member functions to not rely on the
thisObject at all.

Also fixed lookup of QObject properties through the context wrapper
to go through get() as the new interface (to catch destroy/toString).

Change-Id: Iacbe8b5ce1895195a84a1224faba3f3bd34cd03b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp
index 03cedf0303..fec736b777 100644
--- a/src/qml/qml/v8/qv8contextwrapper.cpp
+++ b/src/qml/qml/v8/qv8contextwrapper.cpp
@@ -323,9 +323,13 @@ v8::Handle<v8::Value> QV8ContextWrapper::Getter(v8::Handle<v8::String> property,
 
         // Search scope object
         if (scopeObject) {
-            v8::Handle<v8::Value> result = qobjectWrapper->getProperty(scopeObject, propertystring,
-                                                                       context, QV8QObjectWrapper::CheckRevision);
-            if (!result.IsEmpty()) return result;
+            QV4::Value wrapper = qobjectWrapper->newQObject(scopeObject)->v4Value();
+            if (QV4::Object *o = wrapper.asObject()) {
+                bool hasProperty = false;
+                QV4::Value result = o->get(o->engine()->current, propertystring.string().asString(), &hasProperty);
+                if (hasProperty)
+                    return result;
+            }
         }
         scopeObject = 0;