diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-06-13 16:04:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:20 +0200 |
| commit | da9d5016613d04f002c6433e2b3083143fec34cb (patch) | |
| tree | db73090d9a3c79c2cf777aecc35612faa9797194 /src/qml/qml/v8/qqmlbuiltinfunctions_p.h | |
| parent | b393c405b7568e80628bc99501a9c53bbd0e678d (diff) | |
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>
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions_p.h')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 73c3b8da28..b4e680a4a3 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -75,7 +75,7 @@ struct QtObject : Object QObject *application; } __data; - V4_OBJECT + V4_OBJECT(Object) static ReturnedValue method_isQtObject(CallContext *ctx); @@ -167,7 +167,7 @@ struct QQmlBindingFunction : public QV4::FunctionObject QQmlSourceLocation bindingLocation; } __data; - V4_OBJECT + V4_OBJECT(QV4::FunctionObject) void initBindingLocation(); // from caller stack trace |