From 5599ddd113fe1385e7a6aff708e12af419b8de87 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 4 Mar 2010 15:41:00 +1000
Subject: Don't mess with highlight size if highlightFollowsCurrentItem is
 false.

Task-number: QT-2630
---
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 18d3661..cd8d143 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -799,10 +799,13 @@ void QDeclarativeListViewPrivate::createHighlight()
         if (item) {
             item->setParent(q->viewport());
             highlight = new FxListItem(item, q);
-            if (orient == QDeclarativeListView::Vertical)
-                highlight->item->setHeight(currentItem->item->height());
-            else
-                highlight->item->setWidth(currentItem->item->width());
+            if (currentItem && autoHighlight) {
+                if (orient == QDeclarativeListView::Vertical) {
+                    highlight->item->setHeight(currentItem->item->height());
+                } else {
+                    highlight->item->setWidth(currentItem->item->width());
+                }
+            }
             const QLatin1String posProp(orient == QDeclarativeListView::Vertical ? "y" : "x");
             highlightPosAnimator = new QDeclarativeEaseFollow(q);
             highlightPosAnimator->setTarget(QDeclarativeProperty(highlight->item, posProp));
-- 
cgit v0.12