diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-19 14:44:17 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-26 16:37:43 +0200 |
| commit | ed813c19fa422cd0858dda25a3c401e428fd6e0b (patch) | |
| tree | 7296f82cede7315b8112c7fb6ded7ddfb7abce59 /tests/auto | |
| parent | 9efe2a8603cd9023bfebb96a3a7ca4a65002669d (diff) | |
macOS: rename 'macintosh' style to 'macos'
Change the name/key of the style to 'macos'. Besides the
name 'macintosh' being archaic, we also need this
change to avoid creating 'macintosh' style folders
in QtQuickControls, now that we plan to use QPlatformTheme
also there to resolve the style.
[ChangeLog][Widgets][QStyle] The 'macintosh' style
has been renamed to 'macos'.
Change-Id: I14b8a8b4dbd369e7a7d16b94e4ad27e501e7e8d0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto')
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 84841428f0..0329498a94 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -2892,7 +2892,7 @@ void tst_QGraphicsView::scrollBarRanges() QFETCH(ExpectedValueDescription, vmax); QFETCH(bool, useStyledPanel); - if (useStyledPanel && style == "macintosh" && platformName == QStringLiteral("cocoa")) + if (useStyledPanel && style == "macos" && platformName == QStringLiteral("cocoa")) QSKIP("Insignificant on OSX"); QScopedPointer<QStyle> stylePtr; diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 6963254484..b7b9ab6423 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -270,7 +270,7 @@ bool tst_QStyle::testAllFunctions(QStyle *style) bool tst_QStyle::testScrollBarSubControls(const QStyle *style) { - const bool isMacStyle = style->objectName().compare(QLatin1String("macintosh"), + const bool isMacStyle = style->objectName().compare(QLatin1String("macos"), Qt::CaseInsensitive) == 0; QScrollBar scrollBar; setFrameless(&scrollBar); @@ -328,7 +328,7 @@ void tst_QStyle::testWindowsVistaStyle() #ifdef Q_OS_MAC void tst_QStyle::testMacStyle() { - QStyle *mstyle = QStyleFactory::create("Macintosh"); + QStyle *mstyle = QStyleFactory::create("macos"); QVERIFY(testAllFunctions(mstyle)); delete mstyle; } diff --git a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp index 657a1ea55c..563f3c6e7b 100644 --- a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp +++ b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp @@ -79,7 +79,7 @@ void tst_QFocusFrame::focusFrameInsideScrollview() // is why special considerations are taken inside the focus frame to // prevent the frame to scroll away from the widget it tracks. - if (qApp->style()->objectName() != QLatin1String("macintosh")) + if (qApp->style()->objectName() != QLatin1String("macos")) QSKIP("This test is only valid when using a style that has a focus frame"); QWidget window; diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 634497f22f..7b4e85f823 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -516,7 +516,7 @@ void tst_QPushButton::sizeHint_data() QTest::newRow("windows") << QString::fromLatin1("windows"); #endif #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) - QTest::newRow("macintosh") << QString::fromLatin1("macintosh"); + QTest::newRow("macos") << QString::fromLatin1("macos"); #endif #if !defined(QT_NO_STYLE_FUSION) QTest::newRow("fusion") << QString::fromLatin1("fusion"); |