diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-23 14:08:48 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-23 14:08:48 (GMT) |
| commit | fecce960a050ef2964e28f373bf1a35f7d9949a3 (patch) | |
| tree | 296ef35071a80076a5186e71696cddc88cc1a56f /src/declarative/util/qdeclarativelistmodelworkeragent.cpp | |
| parent | 02c65146610cdd5bfe1f3ee4656ba07af82afcc7 (diff) | |
| parent | 15088d236924bccee787953e04214f87392e8e55 (diff) | |
| download | Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.zip Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.gz Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativelistmodelworkeragent.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodelworkeragent.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp index d91b107..534c923 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp @@ -202,10 +202,9 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e) FlatListModel *orig = m_orig->m_flat; FlatListModel *copy = s->list->m_flat; - if (!orig || !copy) { - qWarning("QML ListModel worker: sync() failed"); + if (!orig || !copy) return QObject::event(e); - } + orig->m_roles = copy->m_roles; orig->m_strings = copy->m_strings; orig->m_values = copy->m_values; |