Merge commit 'qt/master-stable' into 4.6-merged

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 54 insertions, 4 deletions

diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 2ca04d1..ce6afa1 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -92,7 +92,9 @@ private slots:
     void activeSubMenuPosition();
     void task242454_sizeHint();
     void task176201_clear();
-    void task250673_activeMutliColumnSubMenuPosition();
+    void task250673_activeMultiColumnSubMenuPosition();
+    void task256918_setFont();
+    void menuSizeHint();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -686,7 +688,7 @@ void tst_QMenu::task176201_clear()
     QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center());
 }
 
-void tst_QMenu::task250673_activeMutliColumnSubMenuPosition()
+void tst_QMenu::task250673_activeMultiColumnSubMenuPosition()
 {
     class MyMenu : public QMenu
     {
@@ -720,5 +722,53 @@ void tst_QMenu::task250673_activeMutliColumnSubMenuPosition()
     const int subMenuOffset = main.style()->pixelMetric(QStyle::PM_SubMenuOverlap, 0, &main);
     QVERIFY((sub.geometry().left() - subMenuOffset + 5) < main.geometry().right());
 }
+
+
+void tst_QMenu::task256918_setFont()
+{
+    QMenu menu;
+    QAction *action = menu.addAction("foo");
+    QFont f;
+    f.setPointSize(30);
+    action->setFont(f);
+    menu.show(); //ensures that the actiongeometry are calculated
+    QVERIFY(menu.actionGeometry(action).height() > f.pointSize());
+}
+
+void tst_QMenu::menuSizeHint()
+{
+    QMenu menu;
+    //this is a list of arbitrary strings so that we check the geometry
+    QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz"  << "er";
+    foreach(QString str, list)
+        menu.addAction(str);
+
+    int left, top, right, bottom;
+    menu.getContentsMargins(&left, &top, &right, &bottom);
+    const int panelWidth = menu.style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, &menu);
+    const int hmargin = menu.style()->pixelMetric(QStyle::PM_MenuHMargin, 0, &menu),
+        vmargin = menu.style()->pixelMetric(QStyle::PM_MenuVMargin, 0, &menu);
+
+    int maxWidth =0;
+    QRect result;
+    foreach(QAction *action, menu.actions()) {
+        maxWidth = qMax(maxWidth, menu.actionGeometry(action).width());
+        result |= menu.actionGeometry(action);
+        QCOMPARE(result.x(), left + hmargin + panelWidth);
+        QCOMPARE(result.y(), top + vmargin + panelWidth);
+    }
+
+    QStyleOption opt(0);
+    opt.rect = menu.rect();
+    opt.state = QStyle::State_None;
+
+    QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + right + panelWidth, vmargin + top + panelWidth);
+
+    resSize = menu.style()->sizeFromContents(QStyle::CT_Menu, &opt,
+                                    resSize.expandedTo(QApplication::globalStrut()), &menu);
+
+    QCOMPARE(resSize, menu.sizeHint());
+}
+
 QTEST_MAIN(tst_QMenu)
 #include "tst_qmenu.moc"