diff options
| author | Alan Alpert <aalpert@blackberry.com> | 2013-05-01 17:22:14 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 03:09:47 +0200 |
| commit | 7c0156309eef50b5cfd3e498eaed6d7218dc40f8 (patch) | |
| tree | 8eee615bff20d5a548d21ca6ec09f05633e85e82 /src/qml/types/qqmlinstantiator_p_p.h | |
| parent | 9b5a55101d7c519446c1cf3706a235dea81ad4de (diff) | |
Fix Instantiator response to model changev5.1.0-beta1
Objects were not being created correctly when the model changed after
componentComplete. After correcting that the model change can lead to
an intermediate count change when the old model is cleared, so a flag
is set to ignore intermediate changes fom the QQmlDelegateModel when
the model changes.
Task-number: QTBUG-30379
Change-Id: I55519c9ee378a1b0569567137ebd378f32a6c85c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/qml/types/qqmlinstantiator_p_p.h')
| -rw-r--r-- | src/qml/types/qqmlinstantiator_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/types/qqmlinstantiator_p_p.h b/src/qml/types/qqmlinstantiator_p_p.h index 79459299dc..ac25ce809c 100644 --- a/src/qml/types/qqmlinstantiator_p_p.h +++ b/src/qml/types/qqmlinstantiator_p_p.h @@ -76,6 +76,7 @@ public: void _q_modelUpdated(const QQmlChangeSet &, bool); bool componentComplete; + bool effectiveReset; bool active; bool async; bool ownModel; |