AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macos: Rename macos style to macOS

Browse Source 
This change shouldn't matter much to widgets, since style names
there are case insensitive. But for controls style names are
case sensitive, and in that case, "macOS" looks more correct.

Change-Id: Ia1d442bce465692ff58fecba1cc68ecbb2e52549
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2020-09-08 11:24:57 +02:00
parent f9f1043e8a
commit b028fb60e3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoatheme.mm
View File

@ -501,7 +501,7 @@ QVariant QCocoaTheme::themeHint(ThemeHint hint) const
{
switch (hint) {
case QPlatformTheme::StyleNames:
return QStringList(QStringLiteral("macos"));
return QStringList(QStringLiteral("macOS"));
case QPlatformTheme::DialogButtonBoxLayout:
return QVariant(QPlatformDialogHelper::MacLayout);
case KeyboardScheme:

2
src/plugins/styles/mac/macstyle.json
View File

@ -1,3 +1,3 @@
{
"Keys": [ "macos" ]
"Keys": [ "macOS" ]
}

2
src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -2567,7 +2567,7 @@ QPalette QMacStyle::standardPalette() const
{
auto platformTheme = QGuiApplicationPrivate::platformTheme();
auto styleNames = platformTheme->themeHint(QPlatformTheme::StyleNames);
if (styleNames.toStringList().contains("macos"))
if (styleNames.toStringList().contains("macOS"))
return QPalette(); // Inherit everything from theme
else
return QStyle::standardPalette();

2
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
View File

@ -48,7 +48,7 @@
\li The Windows Vista style ("windowsvista") is provided by
QWindowsVistaStyle.
\row
\li The \macos style ("macos") is provided by QMacStyle.
\li The macOS style ("macOS") is provided by QMacStyle.
\li \image macos-style.png \macos Style
\row
\li \image fusion-style.png Fusion Style

2
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -2892,7 +2892,7 @@ void tst_QGraphicsView::scrollBarRanges()
QFETCH(ExpectedValueDescription, vmax);
QFETCH(bool, useStyledPanel);
if (useStyledPanel && style == "macos" && platformName == QStringLiteral("cocoa"))
if (useStyledPanel && style == "macOS" && platformName == QStringLiteral("cocoa"))
QSKIP("Insignificant on OSX");
QScopedPointer<QStyle> stylePtr;