From 8a69992c34bf456df54a5ba26955e782acd4531c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 19 Apr 2012 09:54:17 +0200 Subject: [PATCH] Adapt qtdeclarative to the change in QMetaObject MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Changed in qtbase in If0b8f586cbaf633eed10045adee3ba3366826c86 Change-Id: I28e7d84873c92908b10cbcd61ae66bd8d52ef51e Reviewed-by: Kent Hansen Reviewed-by: Jędrzej Nowacki --- src/qml/qml/ftw/qfastmetabuilder.cpp | 2 ++ src/qml/qml/qqmlscript.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/qml/qml/ftw/qfastmetabuilder.cpp b/src/qml/qml/ftw/qfastmetabuilder.cpp index 9d95605..b22be84 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(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 37c0fb4..05882f3 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() -- 2.7.4