diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 09:01:29 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-13 22:42:04 +0100 |
| commit | 39f1e0d66dc434e764731fbfed29c8fd98d217aa (patch) | |
| tree | d9855dbedd752c23395ccb6d4d3dc8fc3bece254 /src/qml/types/qqmldelegatemodel.cpp | |
| parent | a38f9ec6c96559efa56e8f7346f74f5990810c3a (diff) | |
Make sure we always have an engine when assigning to a Persistent
This prepares things for a rewrite of the internals of Persistent.
Change-Id: Ib93ec5911984d1bfce87ffdc3f86bc75f6ecafe9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qqmldelegatemodel.cpp')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 88cb086d32..8309df8403 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1757,7 +1757,7 @@ void QQmlDelegateModelItemMetaType::initializePrototype() p->setSetter(0); proto->insertMember(s, p, QV4::Attr_Accessor|QV4::Attr_NotConfigurable|QV4::Attr_NotEnumerable); } - modelItemProto = proto; + modelItemProto.set(v4, proto); } int QQmlDelegateModelItemMetaType::parseGroups(const QStringList &groups) const @@ -3341,7 +3341,7 @@ QQmlDelegateModelEngineData::QQmlDelegateModelEngineData(QV4::ExecutionEngine *v proto->defineAccessorProperty(QStringLiteral("index"), QQmlDelegateModelGroupChange::method_get_index, 0); proto->defineAccessorProperty(QStringLiteral("count"), QQmlDelegateModelGroupChange::method_get_count, 0); proto->defineAccessorProperty(QStringLiteral("moveId"), QQmlDelegateModelGroupChange::method_get_moveId, 0); - changeProto = proto; + changeProto.set(v4, proto); } QQmlDelegateModelEngineData::~QQmlDelegateModelEngineData() |