Fix Managed::as<>() method

The as<> casting method was not doing the right thing
in 100% of the cases. It only checked if the object in
question was exactly of the type being asked for. It
however didn't check if the object was derived from the
type.

This commit fixes this by adding a parent chain to the
vtables, that is then being used to check this safely
at runtime.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index d864c1f0b0..0ba4eabbca 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -209,7 +209,7 @@ public:
         NodeImpl *d;
     } __data;
 
-    V4_OBJECT
+    V4_OBJECT(Object)
 
     // C++ API
     static ReturnedValue create(QV8Engine *, NodeImpl *, const QList<NodeImpl *> &);
@@ -247,7 +247,7 @@ public:
         NodeImpl *d;
     } __data;
 
-    V4_OBJECT
+    V4_OBJECT(Object)
 
     // JS API
     static void destroy(Managed *that) {
@@ -288,7 +288,7 @@ public:
             o->defineAccessorProperty(QStringLiteral("attributes"), method_get_attributes, 0);
         }
     };
-    V4_OBJECT
+    V4_OBJECT(Object)
 
     static void initClass(ExecutionEngine *engine);
 
@@ -339,7 +339,7 @@ struct Node : public Object
     struct {
         NodeImpl *d;
     } __data;
-    V4_OBJECT
+    V4_OBJECT(Object)
 
 
     // JS API
@@ -1629,7 +1629,7 @@ struct QQmlXMLHttpRequestWrapper : public Object
         QQmlXMLHttpRequest *request;
     } __data;
 
-    V4_OBJECT
+    V4_OBJECT(Object)
 
     static void destroy(Managed *that) {
         that->as<QQmlXMLHttpRequestWrapper>()->d()->~Data();
@@ -1664,7 +1664,7 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject
         Object *proto;
     } __data;
 
-    V4_OBJECT
+    V4_OBJECT(FunctionObject)
     static void markObjects(Managed *that, ExecutionEngine *e) {
         QQmlXMLHttpRequestCtor *c = that->as<QQmlXMLHttpRequestCtor>();
         if (c->d()->proto)