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/qmdiarea/tst_qmdiarea.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/widgets/widgets/qmdiarea') diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 352a6314f3..068742f33f 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -886,7 +886,7 @@ void tst_QMdiArea::minimumSizeHint() QAbstractScrollArea dummyScrollArea; dummyScrollArea.setFrameStyle(QFrame::NoFrame); expectedSize = expectedSize.expandedTo(dummyScrollArea.minimumSizeHint()); - QCOMPARE(workspace.minimumSizeHint(), expectedSize.expandedTo(qApp->globalStrut())); + QCOMPARE(workspace.minimumSizeHint(), expectedSize); QWidget *window = workspace.addSubWindow(new QWidget); qApp->processEvents(); @@ -908,7 +908,7 @@ void tst_QMdiArea::sizeHint() workspace.show(); QSize desktopSize = QApplication::desktop()->size(); QSize expectedSize(desktopSize.width() * 2/3, desktopSize.height() * 2/3); - QCOMPARE(workspace.sizeHint(), expectedSize.expandedTo(qApp->globalStrut())); + QCOMPARE(workspace.sizeHint(), expectedSize); QWidget *window = workspace.addSubWindow(new QWidget); qApp->processEvents(); -- cgit v1.2.3