Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 27 insertions, 3 deletions

diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
index 5b1fee6..65a9d8a 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
@@ -42,6 +42,7 @@ Rectangle {
         currentIndex: 3
         width: 240
         height: 320
+        keyNavigationWraps: testWrap
         model: testModel
         delegate: myDelegate
         highlightMoveSpeed: 1000
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
index 075e464..280173b 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
@@ -79,7 +79,7 @@ Rectangle {
         width: 240
         height: 320
         model: testModel
-        delegate: animate ? myDelegate : animatedDelegate
+        delegate: testAnimate ? myDelegate : animatedDelegate
         highlightMoveSpeed: 1000
     }
 }
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
index dc339ea..83b8d79 100644
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
@@ -242,6 +242,7 @@ void tst_QmlGraphicsListView::items()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testAnimate", QVariant(false));
 
     canvas->execute();
     qApp->processEvents();
@@ -289,6 +290,7 @@ void tst_QmlGraphicsListView::changed()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testAnimate", QVariant(false));
 
     canvas->execute();
     qApp->processEvents();
@@ -322,6 +324,7 @@ void tst_QmlGraphicsListView::inserted()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testAnimate", QVariant(false));
 
     canvas->execute();
     qApp->processEvents();
@@ -408,7 +411,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("animate", QVariant(animated));
+    ctxt->setContextProperty("testAnimate", QVariant(animated));
 
     canvas->execute();
     qApp->processEvents();
@@ -519,6 +522,7 @@ void tst_QmlGraphicsListView::moved()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testAnimate", QVariant(false));
 
     canvas->execute();
     qApp->processEvents();
@@ -621,6 +625,7 @@ void tst_QmlGraphicsListView::enforceRange()
 
     QCOMPARE(listview->preferredHighlightBegin(), 100.0);
     QCOMPARE(listview->preferredHighlightEnd(), 100.0);
+    QCOMPARE(listview->highlightRangeMode(), QmlGraphicsListView::StrictlyEnforceRange);
 
     QmlGraphicsItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
@@ -656,6 +661,7 @@ void tst_QmlGraphicsListView::spacing()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testAnimate", QVariant(false));
 
     canvas->execute();
     qApp->processEvents();
@@ -778,6 +784,7 @@ void tst_QmlGraphicsListView::currentIndex()
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testWrap", QVariant(false));
 
     QString filename(SRCDIR "/data/listview-initCurrent.qml");
     QFile file(filename);
@@ -794,9 +801,12 @@ void tst_QmlGraphicsListView::currentIndex()
     QmlGraphicsItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
+    QTest::qWait(500);
+
     // current item should be third item
     QCOMPARE(listview->currentIndex(), 3);
     QCOMPARE(listview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 3));
+    QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
 
     // no wrap
     listview->setCurrentIndex(0);
@@ -811,7 +821,8 @@ void tst_QmlGraphicsListView::currentIndex()
     QCOMPARE(listview->currentIndex(), 0);
 
     // with wrap
-    listview->setWrapEnabled(true);
+    ctxt->setContextProperty("testWrap", QVariant(true));
+    QVERIFY(listview->isWrapEnabled());
 
     listview->decrementCurrentIndex();
     QCOMPARE(listview->currentIndex(), model.count()-1);
@@ -844,6 +855,18 @@ void tst_QmlGraphicsListView::currentIndex()
     QVERIFY(key.isAccepted());
     QCOMPARE(listview->currentIndex(), 0);
 
+    // turn off auto highlight
+    listview->setHighlightFollowsCurrentItem(false);
+    QVERIFY(listview->highlightFollowsCurrentItem() == false);
+
+    QTest::qWait(500);
+    QVERIFY(listview->highlightItem());
+    qreal hlPos = listview->highlightItem()->y();
+
+    listview->setCurrentIndex(4);
+    QTest::qWait(500);
+    QCOMPARE(listview->highlightItem()->y(), hlPos);
+
     delete canvas;
 }