diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-08 15:13:22 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 09:53:23 +0100 |
| commit | 979cb5a09e3c2c438eb7f122325d66ed6bf80aba (patch) | |
| tree | d7b8b4f8260f49078d8587f8e317b9255b77bdf7 /src/corelib/kernel/qmetaobjectbuilder.cpp | |
| parent | 09900d3dc5158bca6ec4d40c1a770d32db413894 (diff) | |
Initialize dynamic meta object extradata.
QMetaObject::invokeMethod attempts to deference the extradata for
meta objects versions 6 and greater which is causing a crash in some
of the qtquick1 tests.
Change-Id: If5b2ca83b15de2cd558976c6b681dd5457c404d1
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 529ca22107..064b8edafd 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1432,6 +1432,7 @@ void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output, output->d.superdata = superclass; output->d.stringdata = buf + stringdataOffset; output->d.data = reinterpret_cast<const uint *>(buf + dataOffset); + output->d.extradata = 0; } /*! |