aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-12-01 14:30:44 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-01 05:43:13 +0100
commit8a338a3bba898b6bacd0f18f783aaaab64877070 (patch)
tree604f25a9c5560fee1b7371b40bd8b9d25ce9d184 /src
parente6bafe10966f9faa649befcbee4620470ddd31ef (diff)
Allow current item creation to interrupt async delegate creation.
Fixes unstable test tst_QQuickGridView::insertBeforeVisible(). Change-Id: Iebf02d3c4c202b300409be567906c64c02917dda Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qquickitemview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/items/qquickitemview.cpp b/src/declarative/items/qquickitemview.cpp
index c329cd525e..edbe2a5d06 100644
--- a/src/declarative/items/qquickitemview.cpp
+++ b/src/declarative/items/qquickitemview.cpp
@@ -307,7 +307,7 @@ int QQuickItemView::currentIndex() const
void QQuickItemView::setCurrentIndex(int index)
{
Q_D(QQuickItemView);
- if (d->requestedIndex >= 0) // currently creating item
+ if (d->requestedIndex >= 0 && !d->requestedAsync) // currently creating item
return;
d->currentIndexCleared = (index == -1);