summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmenu
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-09-24 15:26:10 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-09-24 15:26:10 (GMT)
commit270c374c178ec5a532d37168b018cd7ebc844558 (patch)
treea1f3b19daae4a40c296f127b0f8af64107c2c29a /tests/auto/qmenu
parent4d593220a8521c75821609560a3f7e09e28988c5 (diff)
parent9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff)
downloadQt-270c374c178ec5a532d37168b018cd7ebc844558.zip
Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.gz
Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts: examples/webkit/formextractor/formextractor.pro mkspecs/features/qt.prf src/gui/painting/qpaintengineex.cpp
Diffstat (limited to 'tests/auto/qmenu')
-rw-r--r--tests/auto/qmenu/tst_qmenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index d7f453e..e467229 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -676,7 +676,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());
}