diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-18 09:50:36 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-07 12:55:56 +0100 |
commit | da33815fbe356d068af413ca1af9237f551e4f03 (patch) | |
tree | d87bf43e531835f1bcc867b4ac7daf0577194eb2 | |
parent | 077ad5f30446f6b3ccc38cb7f05897566f8e5eb7 (diff) |
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>
-rw-r--r-- | tests/auto/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 7e45bd1f14..6c688eda1b 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 |