diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-03-19 14:01:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 19:44:10 +0100 |
| commit | 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (patch) | |
| tree | c20b30ae5486a4105b0f2f22bf4fd4c6ce84f3f3 /src/quick/items/qquickitemview.cpp | |
| parent | ea8b11259ad68a8ff44708786ecf54e5a8a272d8 (diff) | |
QQuickItemView: Add guard before returning currentItem item
And don't check if the currentItem is empty before calling
applyPendingChanges().
And an autotest. (Patch from Steffen Imhof)
Task-number: QTBUG-30227
Change-Id: Ia16362a6d0dce771f20772929c32e9306ed0e0f9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index b73fb8c5b6..be056d13fd 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -248,10 +248,8 @@ QQuickItemView::~QQuickItemView() QQuickItem *QQuickItemView::currentItem() const { Q_D(const QQuickItemView); - if (!d->currentItem) - return 0; const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges(); - return d->currentItem->item; + return d->currentItem ? d->currentItem->item : 0; } QVariant QQuickItemView::model() const |