diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-03-16 18:45:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 10:49:21 +0100 |
commit | 6deb3ceffa209d710570ffeb361e95c988e6e7cd (patch) | |
tree | c0d7972e3b03771667dc7def07b421bb3763f2dd /src/quick/items/qquickitemview_p_p.h | |
parent | f079f789c593996b0023afd6318d60d18ac66578 (diff) |
Resetting a model can cause a crash in views with header/footer.
Geometry listeners were called for deleted header/footer.
Change-Id: I47854178232f8a4ab5e19a931901b49741fec388
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
-rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index dfc0a8bc7e..7516761ee8 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -60,7 +60,7 @@ QT_MODULE(Quick) class FxViewItem { public: - FxViewItem(QQuickItem *, bool own); + FxViewItem(QQuickItem *, bool own, bool trackGeometry); virtual ~FxViewItem(); qreal itemX() const; @@ -92,6 +92,7 @@ public: int index; bool ownItem; bool releaseAfterTransition; + bool trackGeom; }; @@ -124,6 +125,8 @@ public: QQuickItemViewPrivate(); ~QQuickItemViewPrivate(); + static inline QQuickItemViewPrivate *get(QQuickItemView *o) { return o->d_func(); } + struct ChangeResult { QQmlNullableValue<qreal> visiblePos; bool changedFirstItem; @@ -191,7 +194,7 @@ public: virtual bool releaseItem(FxViewItem *item); QQuickItem *createHighlightItem(); - QQuickItem *createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault = false); + QQuickItem *createComponentItem(QQmlComponent *component, bool createDefault = false); void updateCurrent(int modelIndex); void updateTrackedItem(); |