From 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 8 Apr 2020 13:19:37 +0200 Subject: QApplication: remove obsolete globalStrut functionality Change-Id: If56873f86f5291264cac720f8db7dbd4db756f49 Reviewed-by: Qt CI Bot Reviewed-by: Shawn Rutledge --- tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp') diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index c07961f867..9ee239aceb 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -974,8 +974,7 @@ void tst_QMenu::menuSizeHint() QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + cm.right() + panelWidth, vmargin + cm.top() + panelWidth); - resSize = menu.style()->sizeFromContents(QStyle::CT_Menu, &opt, - resSize.expandedTo(QApplication::globalStrut()), &menu); + resSize = menu.style()->sizeFromContents(QStyle::CT_Menu, &opt, resSize, &menu); QCOMPARE(resSize, menu.sizeHint()); } -- cgit v1.2.3