diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-19 09:54:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 22:49:08 +0200 |
| commit | 8a69992c34bf456df54a5ba26955e782acd4531c (patch) | |
| tree | d3c8e6dcd38913d9ab2a8864c20d363cf50158a4 | |
| parent | 11d0f7827fa8b20c7a084a184e70b90e1e0aeaea (diff) | |
Adapt qtdeclarative to the change in QMetaObject
Changed in qtbase in If0b8f586cbaf633eed10045adee3ba3366826c86
Change-Id: I28e7d84873c92908b10cbcd61ae66bd8d52ef51e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| -rw-r--r-- | src/qml/qml/ftw/qfastmetabuilder.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlscript.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qfastmetabuilder.cpp b/src/qml/qml/ftw/qfastmetabuilder.cpp index 9d956054d9..b22be84107 100644 --- a/src/qml/qml/ftw/qfastmetabuilder.cpp +++ b/src/qml/qml/ftw/qfastmetabuilder.cpp @@ -336,6 +336,8 @@ void QFastMetaBuilder::fromData(QMetaObject *output, const QMetaObject *parent, output->d.stringdata = reinterpret_cast<const QByteArrayData *>(data.constData() + header(data)->fieldCount * sizeof(uint)); output->d.data = fieldPointer(data); output->d.extradata = 0; + output->d.static_metacall = 0; + output->d.relatedMetaObjects = 0; } QT_END_NAMESPACE diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp index 37c0fb44a4..05882f313d 100644 --- a/src/qml/qml/qqmlscript.cpp +++ b/src/qml/qml/qqmlscript.cpp @@ -71,6 +71,8 @@ QQmlScript::Object::Object() extObject.d.stringdata = 0; extObject.d.data = 0; extObject.d.extradata = 0; + extObject.d.static_metacall = 0; + extObject.d.relatedMetaObjects = 0; } QQmlScript::Object::~Object() |