diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-09-09 15:37:57 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-10-06 11:44:08 +0000 |
| commit | 3b14e2ffdd8eb4b7f7f4508768b75f2acc399370 (patch) | |
| tree | 7943f293bf2d0d376d5dc620448bab1a2b58027d /src/quick/items/qquickview_p.h | |
| parent | 1b90dc4482d001512f09a5785d4cbd8030879d82 (diff) | |
QML: Make Heap::Object and all subclasses trivial
GCC6 might dead-store-eliminate out our secret write to Base::mmdata,
because it expects all memory content to be "undefined" before
constructor calls. Clang might take the same approach if the constructor
of Heap::Object is removed.
By making these structs trivial, it also makes them memcpy-able.
Change-Id: I055b2ad28311b997fbe059849ebda4d5894eaa9b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquickview_p.h')
| -rw-r--r-- | src/quick/items/qquickview_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index c21468ef53..9c0d87984f 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -115,9 +115,10 @@ namespace QV4 { namespace Heap { struct QQuickRootItemMarker : Object { - inline QQuickRootItemMarker(QQuickWindow *window) - : window(window) + inline void init(QQuickWindow *window) { + Object::init(); + this->window = window; } QQuickWindow *window; |