diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-01 15:01:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 14:38:20 +0100 |
| commit | af700420c195dc67315d928a7aa1ee23678e6bfb (patch) | |
| tree | 5f816cd50dcf0ee09f62a7dbf2f94b5dc4c3c06b /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 6811eeedc2a10ec7e2174fda55ea897127734275 (diff) | |
[new compiler] Fix revisioning
Always install the property cache on the ddata, not only for types with
a VME meta object, as the cache has the correct revision cache.
Change-Id: I82352df867c1045b37152013eb924aafde2ee874
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index e309595397..1b3235b9b6 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1057,11 +1057,11 @@ bool QmlObjectCreator::populateInstance(int index, QObject *instance, QQmlRefPoi vmeMetaObject = new QQmlVMEMetaObject(_qobject, _propertyCache, reinterpret_cast<const QQmlVMEMetaData*>(data.constData())); if (_ddata->propertyCache) _ddata->propertyCache->release(); - _ddata->propertyCache = _propertyCache; - _ddata->propertyCache->addref(); } else { vmeMetaObject = QQmlVMEMetaObject::get(_qobject); } + _ddata->propertyCache = _propertyCache; + _ddata->propertyCache->addref(); _ddata->lineNumber = _compiledObject->location.line; _ddata->columnNumber = _compiledObject->location.column; |