summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmetaobjectbuilder.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-05-06 08:07:16 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-06 08:07:39 (GMT)
commit4b35a36ca088a79c1aac877d3259e8a981399ee9 (patch)
treefc233cc0f2aa9e6de91b9d95037d218327cc0cc9 /src/declarative/qml/qmetaobjectbuilder.cpp
parent1d9a18142eb19d5dde93b7e5c63f9be0e4caf896 (diff)
parent718013958724210915b24142c499154f751f0bac (diff)
downloadQt-4b35a36ca088a79c1aac877d3259e8a981399ee9.zip
Qt-4b35a36ca088a79c1aac877d3259e8a981399ee9.tar.gz
Qt-4b35a36ca088a79c1aac877d3259e8a981399ee9.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts: src/gui/painting/qpainterpath.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/declarative/qml/qmetaobjectbuilder.cpp')
-rw-r--r--src/declarative/qml/qmetaobjectbuilder.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index a63656b..d8a7b77 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -1452,6 +1452,7 @@ QMetaObject *QMetaObjectBuilder::toMetaObject() const
{
int size = buildMetaObject(d, 0, false);
char *buf = reinterpret_cast<char *>(qMalloc(size));
+ memset(buf, 0, size);
buildMetaObject(d, buf, false);
return reinterpret_cast<QMetaObject *>(buf);
}
@@ -1481,6 +1482,7 @@ QByteArray QMetaObjectBuilder::toRelocatableData(bool *ok) const
QByteArray data;
data.resize(size);
char *buf = data.data();
+ memset(buf, 0, size);
buildMetaObject(d, buf, true);
if (ok) *ok = true;
return data;