From f74dd380f30306bb2cf93ef61bb35dc8db045a11 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Tue, 22 Sep 2009 11:45:22 +0200
Subject: fix tst_QMenu::task242454_sizeHint for Windows mobile

QMenu actually doesn't use QFontMetrics::width to calculate its bounding
rect but QFontMetrics::boundingRect. That's why this test failed on
Windows CE.

Reviewed-by: thierry
---
 tests/auto/qmenu/tst_qmenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 174d1d7..abf8246 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -658,7 +658,7 @@ void tst_QMenu::task242454_sizeHint()
     QMenu menu;
     QString s = QLatin1String("foo\nfoo\nfoo\nfoo");
     menu.addAction(s);
-    QVERIFY(menu.sizeHint().width() > menu.fontMetrics().width(s));
+    QVERIFY(menu.sizeHint().width() > menu.fontMetrics().boundingRect(QRect(), Qt::TextSingleLine, s).width());
 }
 
 
-- 
cgit v0.12