1 files changed, 12 insertions, 34 deletions

diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 899d090b5e..9cfd50bc08 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -1,33 +1,8 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+
+#include <QTest>
 #include <QtWidgets>
 #include <private/qstylehelper_p.h>
 
@@ -75,7 +50,7 @@ private:
     static int vgap(QWidget *widget1, QWidget *widget2) { return gap(widget1, widget2).height(); }
     static void setSize(QWidget *widget, QStyleHelper::WidgetSizePolicy size);
     static int spacing(ControlType control1, ControlType control2, Qt::Orientation orientation,
-                       QStyleOption *option = 0, QWidget *widget = 0);
+                       QStyleOption *option = nullptr, QWidget *widget = nullptr);
     static int hspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
     static int vspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
 };
@@ -83,6 +58,10 @@ private:
 #define SIZE(x, y, z) \
     ((size == QStyleHelper::SizeLarge) ? (x) : (size == QStyleHelper::SizeSmall) ? (y) : (z))
 
+static bool bigSurOrAbove() {
+    return QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur;
+}
+
 void tst_QMacStyle::sizeHints_data()
 {
     QTest::addColumn<QStyleHelper::WidgetSizePolicy>("size");
@@ -133,7 +112,7 @@ void tst_QMacStyle::sizeHints()
     QCOMPARE(sh(&comboBox3).height(), SIZE(32, -1, -1));
 
     QSlider slider1(Qt::Horizontal, &w);
-    QCOMPARE(sh(&slider1).height(), SIZE(15, 12, 10));
+    QCOMPARE(sh(&slider1).height(), SIZE(bigSurOrAbove() ? 18 : 15, 12, 10));
 
     slider1.setTickPosition(QSlider::TicksAbove);
     QCOMPARE(sh(&slider1).height(), SIZE(24, 17, 16));  // Builder
@@ -142,7 +121,7 @@ void tst_QMacStyle::sizeHints()
     QCOMPARE(sh(&slider1).height(), SIZE(24, 17, 16));  // Builder
 
     slider1.setTickPosition(QSlider::TicksBothSides);
-    QVERIFY(sh(&slider1).height() > SIZE(15, 12, 10));  // common sense
+    QVERIFY(sh(&slider1).height() > SIZE(bigSurOrAbove() ? 18 : 15, 12, 10));  // common sense
 
     QPushButton ok1("OK", &w);
     QPushButton cancel1("Cancel", &w);
@@ -189,7 +168,6 @@ void tst_QMacStyle::sizeHints()
     QDateTimeEdit dateTime1(&w);
     QCOMPARE(sh(&dateTime1).height(), h1);
 
-    ok1.setAttribute(Qt::WA_MacMetalStyle, true);
     QSize s2 = sh(&ok1);
     if (size == Normal) {
         QVERIFY(s2.height() >= 21 && s2.height() <= 32);