From f60b50f86e5d99de49497f5ead8a76207991cc4c Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 7 Oct 2009 12:18:17 +1000
Subject: fix tst_QAbstractItemView::task250754_fontChange for Windows CE

We need to give Windows mobile some more time to handle all internal
timer events. Otherwise QTreeView::updateScrollBars doesn't get called.

Reviewed-by: mauricek
(cherry picked from commit b1310cb8fcc4b48750f82502a7140f2ebb8a44c7)

Conflicts:

	tests/auto/qabstractitemview/tst_qabstractitemview.cpp
---
 .../auto/qabstractitemview/tst_qabstractitemview.cpp  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index be2d882..957a7da 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -184,6 +184,10 @@ public:
     virtual ~tst_QAbstractItemView();
     void basic_tests(TestView *view);
 
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
 private slots:
     void getSetCheck();
     void emptyModels_data();
@@ -320,6 +324,17 @@ tst_QAbstractItemView::~tst_QAbstractItemView()
 {
 }
 
+void tst_QAbstractItemView::initTestCase()
+{
+#ifdef Q_OS_WINCE_WM
+    qApp->setAutoMaximizeThreshold(-1);
+#endif
+}
+
+void tst_QAbstractItemView::cleanupTestCase()
+{
+}
+
 void tst_QAbstractItemView::emptyModels_data()
 {
     QTest::addColumn<QString>("viewType");
@@ -1198,16 +1213,12 @@ void tst_QAbstractItemView::task250754_fontChange()
     QFont font = tree.font();
     font.setPointSize(5);
     tree.setFont(font);
-    QTest::qWait(30);
-
     QTRY_VERIFY(!tree.verticalScrollBar()->isVisible());
 
     font.setPointSize(45);
     tree.setFont(font);
-    QTest::qWait(30);
     //now with the huge items, the scrollbar must be visible
     QTRY_VERIFY(tree.verticalScrollBar()->isVisible());
-
     qApp->setStyleSheet(app_css);
 }
 
-- 
cgit v0.12