From da33815fbe356d068af413ca1af9237f551e4f03 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 18 Dec 2012 09:50:36 +0100
Subject: [PATCH] Fix tst_qquicktextinput on Windows and Mac.

Both require a sensible window size.

Task-number: QTBUG-23485
Task-number: QTBUG-28611
Change-Id: If888dd4d60fccdabc9856f914d6542ced6a41d64
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
---
 .../quick/qquicktextinput/tst_qquicktextinput.cpp  |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 7e45bd1..6c688ed 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -3448,15 +3448,13 @@ public:
 void tst_qquicktextinput::setHAlignClearCache()
 {
     QQuickView view;
+    view.resize(200, 200);
     MyTextInput input;
     input.setText("Hello world");
     input.setParentItem(view.contentItem());
     view.show();
     view.requestActivate();
     QTest::qWaitForWindowActive(&view);
-#ifdef Q_OS_MAC
-    QEXPECT_FAIL("", "QTBUG-23485", Abort);
-#endif
     QTRY_COMPARE(input.nbPaint, 1);
     input.setHAlign(QQuickTextInput::AlignRight);
     //Changing the alignment should trigger a repaint
-- 
1.7.2.5