diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-09-08 11:07:26 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-09-30 14:14:31 +0000 |
| commit | b80fa8e7d59c2824de067ab4d488d865a6e69d94 (patch) | |
| tree | dfbab030756f9c5a0f76aba8a558f429311724a2 /src/qml/jsruntime/qv4memberdata_p.h | |
| parent | c2e28350a6ea866b9e68059f232aaeccd47f743b (diff) | |
QML: Make all context objects trivial
This change also adds a check to the d() calls for Managed, verifies
that the object has been initialized. This is only done for debug
builds.
To prevent other code from tripping the check, a number of other classes
are either marked as trivial, or do initialization in the constructors.
Because of template function changes in them memory manager (those now
call init() instead of in-place new), String has an extra parameter
to force it to temporarily use an old/unmodified template function.
Change-Id: I8c35161ce7680835d830638b6d21498c5129b02b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4memberdata_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4memberdata_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h index 2742e0b212..41da730428 100644 --- a/src/qml/jsruntime/qv4memberdata_p.h +++ b/src/qml/jsruntime/qv4memberdata_p.h @@ -66,6 +66,7 @@ struct MemberData : Base { }; Value data[1]; }; +Q_STATIC_ASSERT(std::is_trivial<MemberData>::value); } |