diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-03 18:27:21 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-03 18:27:21 +0100 |
commit | a4476cc12ee46be6cbb417bda7cf86743aca3064 (patch) | |
tree | 62e426ffee1f12d8004a0bc1332800b555c93600 /src/declarative/qml/qdeclarativevme.cpp | |
parent | 190fd107ebf489783d9b673b97598da8febd48cc (diff) | |
parent | 2866c00375313d1726cc0473b6b7bfc87b984c78 (diff) |
Merge remote-tracking branch 'origin/release' into stablev5.2.1
Change-Id: Id938fd62f7a500973b43f21e803f8b8c0c1a660d
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; |