diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 18:08:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-15 00:32:45 +0100 |
| commit | ad342b052473a8ec8c693591a8a882313ccd7d62 (patch) | |
| tree | 502172a96bd56cda918a5552017f95308ee15f9f /src/qml/qml/v8/qqmlbuiltinfunctions_p.h | |
| parent | d4d92ab002bab0fdb8ddbac4babad260ed75d090 (diff) | |
Changed MemoryManager::alloc<T> to return Heap::T* instead of T*
Change-Id: Iede1ba624d1313fbe2f8e5e979e936f1f32efdc9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions_p.h')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 4a50111e60..baedd19e47 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -121,6 +121,8 @@ struct QtObject : Object struct ConsoleObject : Object { typedef Heap::ConsoleObject Data; + const Data *d() const { return static_cast<const Data *>(Object::d()); } + Data *d() { return static_cast<Data *>(Object::d()); } static ReturnedValue method_error(CallContext *ctx); static ReturnedValue method_log(CallContext *ctx); |