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>

2 files changed, 4 insertions, 7 deletions

diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 84e2fd72a9..bd79710b05 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -1570,8 +1570,7 @@ void QHeaderView::resetDefaultSectionSize()
     \brief the minimum size of the header sections.
 
     The minimum section size is the smallest section size allowed. If the
-    minimum section size is set to -1, QHeaderView will use the maximum of
-    the \l{QApplication::globalStrut()}{global strut} or the
+    minimum section size is set to -1, QHeaderView will use the
     \l{fontMetrics()}{font metrics} size.
 
     This property is honored by all \l{ResizeMode}{resize modes}.
@@ -1582,11 +1581,10 @@ int QHeaderView::minimumSectionSize() const
 {
     Q_D(const QHeaderView);
     if (d->minimumSectionSize == -1) {
-        QSize strut = QApplication::globalStrut();
         int margin = 2 * style()->pixelMetric(QStyle::PM_HeaderMargin, nullptr, this);
         if (d->orientation == Qt::Horizontal)
-            return qMax(strut.width(), (fontMetrics().maxWidth() + margin));
-        return qMax(strut.height(), (fontMetrics().height() + margin));
+            return fontMetrics().maxWidth() + margin;
+        return fontMetrics().height() + margin;
     }
     return d->minimumSectionSize;
 }
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index fe9b482122..b29fd373bc 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -577,8 +577,7 @@ void QExpandingLineEdit::updateMinimumWidth()
     QStyleOptionFrame opt;
     initStyleOption(&opt);
 
-    int minWidth = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(width, 0).
-                                      expandedTo(QApplication::globalStrut()), this).width();
+    int minWidth = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(width, 0), this).width();
     setMinimumWidth(minWidth);
 }