QApplication: remove obsolete globalStrut functionality

Change-Id: If56873f86f5291264cac720f8db7dbd4db756f49
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

20 files changed, 30 insertions, 52 deletions

diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 04176ab5e2..8f9e06eeb8 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -924,8 +924,7 @@ QSize QAbstractSpinBox::sizeHint() const
         QStyleOptionSpinBox opt;
         initStyleOption(&opt);
         QSize hint(w, h);
-        d->cachedSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this)
-                            .expandedTo(QApplication::globalStrut());
+        d->cachedSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this);
     }
     return d->cachedSizeHint;
 }
@@ -966,8 +965,7 @@ QSize QAbstractSpinBox::minimumSizeHint() const
         initStyleOption(&opt);
         QSize hint(w, h);
 
-        d->cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this)
-                                   .expandedTo(QApplication::globalStrut());
+        d->cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this);
     }
     return d->cachedMinimumSizeHint;
 }
diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp
index 81bfd3af35..b06ae82249 100644
--- a/src/widgets/widgets/qcheckbox.cpp
+++ b/src/widgets/widgets/qcheckbox.cpp
@@ -292,8 +292,7 @@ QSize QCheckBox::sizeHint() const
                                      text()).size();
     if (!opt.icon.isNull())
         sz = QSize(sz.width() + opt.iconSize.width() + 4, qMax(sz.height(), opt.iconSize.height()));
-    d->sizeHint = (style()->sizeFromContents(QStyle::CT_CheckBox, &opt, sz, this)
-                  .expandedTo(QApplication::globalStrut()));
+    d->sizeHint = style()->sizeFromContents(QStyle::CT_CheckBox, &opt, sz, this);
     return d->sizeHint;
 }
 
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 8f195381e4..a854ce2cb8 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -439,7 +439,7 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const
         q->initStyleOption(&opt);
         sh = q->style()->sizeFromContents(QStyle::CT_ComboBox, &opt, sh, q);
     }
-    return sh.expandedTo(QApplication::globalStrut());
+    return sh;
 }
 
 void QComboBoxPrivate::adjustComboBoxSize()
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 16705be1ff..f1db87f414 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1051,8 +1051,7 @@ QSize QDateTimeEdit::sizeHint() const
         {
             QStyleOptionSpinBox opt;
             initStyleOption(&opt);
-            d->cachedSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this)
-                                .expandedTo(QApplication::globalStrut());
+            d->cachedSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this);
         }
 
         d->cachedMinimumSizeHint = d->cachedSizeHint;
diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp
index 25d57970bf..7dd469faae 100644
--- a/src/widgets/widgets/qdial.cpp
+++ b/src/widgets/widgets/qdial.cpp
@@ -464,7 +464,7 @@ QSize QDial::minimumSizeHint() const
 
 QSize QDial::sizeHint() const
 {
-    return QSize(100, 100).expandedTo(QApplication::globalStrut());
+    return QSize(100, 100);
 }
 
 /*!
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 055412528f..8b8a6b3208 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -703,8 +703,7 @@ QSize QLineEdit::sizeHint() const
             + d->leftmargin + d->rightmargin; // "some"
     QStyleOptionFrame opt;
     initStyleOption(&opt);
-    return (style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(w, h).
-                                      expandedTo(QApplication::globalStrut()), this));
+    return style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(w, h), this);
 }
 
 
@@ -728,8 +727,7 @@ QSize QLineEdit::minimumSizeHint() const
             + d->leftmargin + d->rightmargin;
     QStyleOptionFrame opt;
     initStyleOption(&opt);
-    return (style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(w, h).
-                                      expandedTo(QApplication::globalStrut()), this));
+    return style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(w, h), this);
 }
 
 
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index da6eb47372..713c5f3d75 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -1751,7 +1751,7 @@ QSize QMdiArea::sizeHint() const
             continue;
         size = size.expandedTo(child->sizeHint());
     }
-    return size.expandedTo(QApplication::globalStrut());
+    return size;
 }
 
 /*!
@@ -1770,7 +1770,7 @@ QSize QMdiArea::minimumSizeHint() const
             size = size.expandedTo(child->minimumSizeHint());
         }
     }
-    return size.expandedTo(QApplication::globalStrut());
+    return size;
 }
 
 /*!
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index f8460a4718..f68f46a7f1 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -3516,7 +3516,7 @@ QSize QMdiSubWindow::minimumSizeHint() const
     minHeight = qMax(minHeight, decorationHeight + sizeGripHeight);
 #endif
 
-    return QSize(minWidth, minHeight).expandedTo(QApplication::globalStrut());
+    return QSize(minWidth, minHeight);
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 31a7ad8695..86bc3d69be 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -307,7 +307,7 @@ QPlatformMenuItem * QMenuPrivate::insertActionInPlatformMenu(const QAction *acti
 int QMenuPrivate::scrollerHeight() const
 {
     Q_Q(const QMenu);
-    return qMax(QApplication::globalStrut().height(), q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, nullptr, q));
+    return q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, nullptr, q);
 }
 
 // Windows and KDE allow menus to cover the taskbar, while GNOME and macOS
@@ -476,7 +476,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
 
     max_column_width += tabWidth; //finally add in the tab width
     if (!tornoff || (tornoff && scroll)) { // exclude non-scrollable tear-off menu since the tear-off menu has a fixed size
-        const int sfcMargin = style->sizeFromContents(QStyle::CT_Menu, &opt, QApplication::globalStrut(), q).width() - QApplication::globalStrut().width();
+        const int sfcMargin = style->sizeFromContents(QStyle::CT_Menu, &opt, QSize(0, 0), q).width();
         const int min_column_width = q->minimumWidth() - (sfcMargin + leftmargin + rightmargin + 2 * (fw + hmargin));
         max_column_width = qMax(min_column_width, max_column_width);
     }
@@ -2308,8 +2308,7 @@ QSize QMenu::sizeHint() const
     s.rwidth() += style()->pixelMetric(QStyle::PM_MenuHMargin, &opt, this) + fw + d->rightmargin;
     s.rheight() += style()->pixelMetric(QStyle::PM_MenuVMargin, &opt, this) + fw + d->bottommargin;
 
-    return style()->sizeFromContents(QStyle::CT_Menu, &opt,
-                                    s.expandedTo(QApplication::globalStrut()), this);
+    return style()->sizeFromContents(QStyle::CT_Menu, &opt, s, this);
 }
 
 /*!
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index c8124468df..9122273d0d 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1654,9 +1654,7 @@ QSize QMenuBar::minimumSizeHint() const
         opt.menuItemType = QStyleOptionMenuItem::Normal;
         opt.checkType = QStyleOptionMenuItem::NotCheckable;
         opt.palette = palette();
-        return (style()->sizeFromContents(QStyle::CT_MenuBar, &opt,
-                                         ret.expandedTo(QApplication::globalStrut()),
-                                         this));
+        return style()->sizeFromContents(QStyle::CT_MenuBar, &opt, ret, this);
     }
     return ret;
 }
@@ -1707,9 +1705,7 @@ QSize QMenuBar::sizeHint() const
         opt.menuItemType = QStyleOptionMenuItem::Normal;
         opt.checkType = QStyleOptionMenuItem::NotCheckable;
         opt.palette = palette();
-        return (style()->sizeFromContents(QStyle::CT_MenuBar, &opt,
-                                         ret.expandedTo(QApplication::globalStrut()),
-                                         this));
+        return style()->sizeFromContents(QStyle::CT_MenuBar, &opt, ret, this);
     }
     return ret;
 }
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 3d075bf92f..bb2848aa43 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -427,8 +427,7 @@ QSize QPushButton::sizeHint() const
     if (menu())
         w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
 #endif
-    d->sizeHint = (style()->sizeFromContents(QStyle::CT_PushButton, &opt, QSize(w, h), this).
-                  expandedTo(QApplication::globalStrut()));
+    d->sizeHint = style()->sizeFromContents(QStyle::CT_PushButton, &opt, QSize(w, h), this);
     return d->sizeHint;
 }
 
diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp
index fd8922ed28..103f3ac441 100644
--- a/src/widgets/widgets/qradiobutton.cpp
+++ b/src/widgets/widgets/qradiobutton.cpp
@@ -195,8 +195,7 @@ QSize QRadioButton::sizeHint() const
                                      false, text()).size();
     if (!opt.icon.isNull())
         sz = QSize(sz.width() + opt.iconSize.width() + 4, qMax(sz.height(), opt.iconSize.height()));
-    d->sizeHint = (style()->sizeFromContents(QStyle::CT_RadioButton, &opt, sz, this).
-                  expandedTo(QApplication::globalStrut()));
+    d->sizeHint = style()->sizeFromContents(QStyle::CT_RadioButton, &opt, sz, this);
     return d->sizeHint;
 }
 
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
index 2ce1d50c86..188ee7c25c 100644
--- a/src/widgets/widgets/qscrollbar.cpp
+++ b/src/widgets/widgets/qscrollbar.cpp
@@ -448,8 +448,7 @@ QSize QScrollBar::sizeHint() const
     else
         size = QSize(scrollBarExtent, scrollBarExtent * 2 + scrollBarSliderMin);
 
-    return style()->sizeFromContents(QStyle::CT_ScrollBar, &opt, size, this)
-        .expandedTo(QApplication::globalStrut());
+    return style()->sizeFromContents(QStyle::CT_ScrollBar, &opt, size, this);
  }
 
 /*!\reimp */
diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp
index 95a4beeb57..68fd3ddce1 100644
--- a/src/widgets/widgets/qsizegrip.cpp
+++ b/src/widgets/widgets/qsizegrip.cpp
@@ -230,8 +230,7 @@ QSize QSizeGrip::sizeHint() const
 {
     QStyleOption opt(0);
     opt.init(this);
-    return (style()->sizeFromContents(QStyle::CT_SizeGrip, &opt, QSize(13, 13), this).
-            expandedTo(QApplication::globalStrut()));
+    return style()->sizeFromContents(QStyle::CT_SizeGrip, &opt, QSize(13, 13), this);
 }
 
 /*!
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index 161e4ba27a..7008da32b5 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -472,7 +472,7 @@ QSize QSlider::sizeHint() const
         w = SliderLength;
         h = thick;
     }
-    return style()->sizeFromContents(QStyle::CT_Slider, &opt, QSize(w, h), this).expandedTo(QApplication::globalStrut());
+    return style()->sizeFromContents(QStyle::CT_Slider, &opt, QSize(w, h), this);
 }
 
 /*!
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 090aa5cc8b..f0ea068edd 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -230,8 +230,7 @@ QSize QSplitterHandle::sizeHint() const
     QStyleOption opt(0);
     opt.init(d->s);
     opt.state = QStyle::State_None;
-    return parentWidget()->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(hw, hw), d->s)
-        .expandedTo(QApplication::globalStrut());
+    return parentWidget()->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(hw, hw), d->s);
 }
 
 /*!
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 2cfae39b2a..57339ebd74 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -1502,8 +1502,7 @@ QSize QTabBar::sizeHint() const
         if (d->tabList.at(i).visible)
             r = r.united(d->tabList.at(i).maxRect);
     }
-    QSize sz = QApplication::globalStrut();
-    return r.size().expandedTo(sz);
+    return r.size();
 }
 
 /*!\reimp
@@ -1519,7 +1518,7 @@ QSize QTabBar::minimumSizeHint() const
             if (d->tabList.at(i).visible)
                 r = r.united(d->tabList.at(i).minRect);
         }
-        return r.size().expandedTo(QApplication::globalStrut());
+        return r.size();
     }
     if (verticalTabs(d->shape))
         return QSize(sizeHint().width(), d->rightB->sizeHint().height() * 2 + 75);
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index a19dacda52..8885610e26 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -904,8 +904,7 @@ QSize QTabWidget::sizeHint() const
 
     QSize sz = basicSize(d->pos == North || d->pos == South, lc, rc, s, t);
 
-    return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this)
-                    .expandedTo(QApplication::globalStrut());
+    return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this);
 }
 
 
@@ -938,8 +937,7 @@ QSize QTabWidget::minimumSizeHint() const
     initStyleOption(&opt);
     opt.palette = palette();
     opt.state = QStyle::State_None;
-    return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this)
-                    .expandedTo(QApplication::globalStrut());
+    return style()->sizeFromContents(QStyle::CT_TabWidget, &opt, sz, this);
 }
 
 /*!
@@ -953,8 +951,7 @@ int QTabWidget::heightForWidth(int width) const
     opt.state = QStyle::State_None;
 
     QSize zero(0,0);
-    const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this)
-                                  .expandedTo(QApplication::globalStrut());
+    const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this);
 
     QSize lc(0, 0), rc(0, 0);
     if (d->leftCornerWidget)
@@ -984,7 +981,7 @@ int QTabWidget::heightForWidth(int width) const
     QSize s(stackWidth, stackHeight);
 
     QSize contentSize = basicSize(tabIsHorizontal, lc, rc, s, t);
-    return (contentSize + padding).expandedTo(QApplication::globalStrut()).height();
+    return (contentSize + padding).height();
 }
 
 
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 4767394842..5500104afb 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -189,8 +189,7 @@ QSize QToolBoxButton::sizeHint() const
     }
     QSize textSize = fontMetrics().size(Qt::TextShowMnemonic, text()) + QSize(0, 8);
 
-    QSize total(iconSize.width() + textSize.width(), qMax(iconSize.height(), textSize.height()));
-    return total.expandedTo(QApplication::globalStrut());
+    return QSize(iconSize.width() + textSize.width(), qMax(iconSize.height(), textSize.height()));
 }
 
 QSize QToolBoxButton::minimumSizeHint() const
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index cfa4782d78..410c326d51 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -369,8 +369,7 @@ QSize QToolButton::sizeHint() const
     if (d->popupMode == MenuButtonPopup)
         w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
 
-    d->sizeHint = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this).
-                  expandedTo(QApplication::globalStrut());
+    d->sizeHint = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
     return d->sizeHint;
 }