diff options
Diffstat (limited to 'tests/auto/widgets/widgets')
4 files changed, 20 insertions, 16 deletions
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(); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 1c19bf96d6..dfba506cf9 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -255,25 +255,33 @@ void tst_QMdiSubWindow::sizeHint() void tst_QMdiSubWindow::minimumSizeHint() { - const auto globalStrut = QApplication::globalStrut(); + class Widget : public QWidget + { + public: + Widget() = default; + + QSize minimumSizeHint() const + { + return QSize(100, 100); + } + + }; QMdiSubWindow window; window.setWindowTitle(QLatin1String(QTest::currentTestFunction())); window.show(); - QCOMPARE(window.minimumSizeHint(), globalStrut); + QCOMPARE(window.minimumSizeHint(), QSize(0, 0)); window.setWidget(new QWidget); - QCOMPARE(window.minimumSizeHint(), window.layout()->minimumSize() - .expandedTo(globalStrut)); + QCOMPARE(window.minimumSizeHint(), window.layout()->minimumSize()); delete window.widget(); delete window.layout(); - window.setWidget(new QWidget); - QCOMPARE(window.minimumSizeHint(), globalStrut); + window.setWidget(new Widget); + QCOMPARE(window.minimumSizeHint(), QSize(0, 0)); window.widget()->show(); - QCOMPARE(window.minimumSizeHint(), window.widget()->minimumSizeHint() - .expandedTo(globalStrut)); + QCOMPARE(window.minimumSizeHint(), window.widget()->minimumSizeHint()); } void tst_QMdiSubWindow::minimumSize() 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()); } diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 90e89ff1d5..1638ac846f 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -1416,10 +1416,7 @@ void tst_QMenuBar::menubarSizeHint() QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(panelWidth + hmargin, panelWidth + vmargin); - - resSize = style.sizeFromContents(QStyle::CT_MenuBar, &opt, - resSize.expandedTo(QApplication::globalStrut()), - &mb); + resSize = style.sizeFromContents(QStyle::CT_MenuBar, &opt, resSize, &mb); QCOMPARE(resSize, mb.sizeHint()); } |