Fix Instantiator response to model change v5.1.0-beta1
authorAlan Alpert <aalpert@blackberry.com>
Thu, 2 May 2013 00:22:14 +0000 (17:22 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 8 May 2013 01:09:47 +0000 (03:09 +0200)
commit7c0156309eef50b5cfd3e498eaed6d7218dc40f8
tree8eee615bff20d5a548d21ca6ec09f05633e85e82
parent9b5a55101d7c519446c1cf3706a235dea81ad4de
Fix Instantiator response to model change

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>
src/qml/types/qqmlinstantiator.cpp
src/qml/types/qqmlinstantiator_p_p.h