summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2013-12-02 23:18:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 14:48:12 +0100
commit1983bc9c374fc8b83f608ecc1e6ce6ef4f54e572 (patch)
treed5c349dee4fe4fef55a77410b2fc1b7a0c8a2cd6
parent41dedabb0115da186583c49f7fc93882f3e8abde (diff)
Make layoutDirection pass with new expose behavior
A QMenu with no actions gets a size of (0, 0) on OS X. With the new stricter expose event behavior this is considered invalid geometry and the platform plugin won't send an expose event, causing the qWaitForWindowExposed test to fail. Add a menu entry since the layoutDirection test is not really interested in testing the special case of empty menus. Change-Id: I5221dc3f0472ac13edf821df08bacc3a4eb5cd9d Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-rw-r--r--tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 7c1bb957d6..ece9026ba2 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -570,6 +570,7 @@ void tst_QMenu::layoutDirection()
win.setLayoutDirection(Qt::RightToLeft);
QMenu menu(&win);
+ menu.addAction("foo");
menu.show();
QVERIFY(QTest::qWaitForWindowExposed(&menu));
QCOMPARE(menu.layoutDirection(), Qt::RightToLeft);