diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-08 11:24:57 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-11 06:23:39 +0200 |
| commit | b028fb60e30ec7848096276bfeeac13091b888f8 (patch) | |
| tree | 04d506b065f34ec0f916dcc33c73cccfe9500d8e /src/plugins | |
| parent | f9f1043e8a7706cbf6011ff4a42922b976b7a7fd (diff) | |
macos: Rename macos style to macOS
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 2 | ||||
| -rw-r--r-- | src/plugins/styles/mac/macstyle.json | 2 | ||||
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index af4c1550e7..f88569df05 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -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: diff --git a/src/plugins/styles/mac/macstyle.json b/src/plugins/styles/mac/macstyle.json index a3f378799f..5d7a50a339 100644 --- a/src/plugins/styles/mac/macstyle.json +++ b/src/plugins/styles/mac/macstyle.json @@ -1,3 +1,3 @@ { - "Keys": [ "macos" ] + "Keys": [ "macOS" ] } diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 88de97ab10..71f080ab13 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -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(); |