diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 14:56:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 16:05:03 +0200 |
| commit | a896d4b39ec3d45ba708d9b36ea9c864b1df2136 (patch) | |
| tree | 45cfe153cce6114c2c76c48dc0bdabde2a8cf3e3 /src/qml/qml/qqmlscript.cpp | |
| parent | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (diff) | |
| parent | 65bfc35429e845cf6b76d58107360a1360a654fc (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/v4/qv4bindings.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
src/quick/qtquick2.cpp
Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
Diffstat (limited to 'src/qml/qml/qqmlscript.cpp')
| -rw-r--r-- | src/qml/qml/qqmlscript.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp index e1925eb238..37c0fb44a4 100644 --- a/src/qml/qml/qqmlscript.cpp +++ b/src/qml/qml/qqmlscript.cpp @@ -66,6 +66,11 @@ QQmlScript::Object::Object() : type(-1), idIndex(-1), metatype(0), synthCache(0), defaultProperty(0), parserStatusCast(-1), componentCompileState(0), nextAliasingObject(0), nextIdObject(0) { + // initialize the members in the meta object + extObject.d.superdata = 0; + extObject.d.stringdata = 0; + extObject.d.data = 0; + extObject.d.extradata = 0; } QQmlScript::Object::~Object() |