diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 14:30:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:19 +0200 |
| commit | b393c405b7568e80628bc99501a9c53bbd0e678d (patch) | |
| tree | 51280658b1ec97947a66c6afc503b23ae48f0d8d /src/quick/items/qquickview_p.h | |
| parent | 00a46fa07bf87c6ffa0d60b4a98b51685fdc1ef5 (diff) | |
Change the object allocation scheme
Instead of allocating the data directly, centralize the object and its ::Data
allocation in one place in the memory manager. This is in preparation for
additional pointer indirection later.
Change-Id: I7880e1e7354b3258b6a8965be378cd09c9467d25
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/items/qquickview_p.h')
| -rw-r--r-- | src/quick/items/qquickview_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 8b35500de9..4666ed4d4b 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -120,7 +120,7 @@ struct QQuickRootItemMarker : public QV4::Object V4_OBJECT - static Data *create(QQmlEngine *engine, QQuickWindow *window); + static QQuickRootItemMarker *create(QQmlEngine *engine, QQuickWindow *window); static void markObjects(Managed *that, QV4::ExecutionEngine *e); |