diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:46:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:46:03 +0100 |
| commit | a48df54486c6f22e99e13bec34533a9e97f4a404 (patch) | |
| tree | deff7f0d04e85b507e3f4010ff44528ff801a80a /src/declarative/qml/qdeclarativevme.cpp | |
| parent | 7e9b0f8e55cbdfc780a28b054ac2ad66a630e312 (diff) | |
| parent | a4476cc12ee46be6cbb417bda7cf86743aca3064 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib5b91e20ee9aff1fb0eba6854fa517961f8fce5b
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index c4be742c..45c3f1b5 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -287,6 +287,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack, instr.createSimple.create(o); QDeclarativeData *ddata = (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize); + ddata->ownedByQml1 = true; const QDeclarativeCompiledData::TypeReference &ref = types.at(instr.createSimple.type); if (!ddata->propertyCache && ref.typePropertyCache) { ddata->propertyCache = ref.typePropertyCache; |