From 5c87831d2d87925e0593afedd450715c15063a6c Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 16 Nov 2009 14:42:20 +1000
Subject: Test delegate being set before model.

---
 .../declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml     | 2 +-
 .../auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp  | 4 ++++
 .../declarative/qmlgraphicslistview/data/listview-initCurrent.qml     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
index d9e9f27..32833d2 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
+++ b/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
@@ -45,7 +45,7 @@ Rectangle {
         currentIndex: 5
         cellWidth: 80
         cellHeight: 60
-        model: testModel
         delegate: myDelegate
+        model: testModel
     }
 }
diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
index d09aad7..d0b7462 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
+++ b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
@@ -390,7 +390,11 @@ void tst_QmlGraphicsGridView::removed()
     gridview->setViewportY(120);
     gridview->setCurrentIndex(10);
 
+    // let transitions settle.
+    QTest::qWait(300);
+
     model.removeItem(1);
+
     // let transitions settle.
     QTest::qWait(300);
 
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
index 65a9d8a..74f5ef4 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
@@ -43,8 +43,8 @@ Rectangle {
         width: 240
         height: 320
         keyNavigationWraps: testWrap
-        model: testModel
         delegate: myDelegate
         highlightMoveSpeed: 1000
+        model: testModel
     }
 }
-- 
cgit v0.12