summaryrefslogtreecommitdiffstats
path: root/src/plugins/styles/mac/qmacstyle_mac.mm
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-19 14:44:17 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-26 16:37:43 +0200
commited813c19fa422cd0858dda25a3c401e428fd6e0b (patch)
tree7296f82cede7315b8112c7fb6ded7ddfb7abce59 /src/plugins/styles/mac/qmacstyle_mac.mm
parent9efe2a8603cd9023bfebb96a3a7ca4a65002669d (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 'src/plugins/styles/mac/qmacstyle_mac.mm')
-rw-r--r--src/plugins/styles/mac/qmacstyle_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index a7756919f9..708f298af5 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -2572,7 +2572,7 @@ QPalette QMacStyle::standardPalette() const
{
auto platformTheme = QGuiApplicationPrivate::platformTheme();
auto styleNames = platformTheme->themeHint(QPlatformTheme::StyleNames);
- if (styleNames.toStringList().contains("macintosh"))
+ if (styleNames.toStringList().contains("macos"))
return QPalette(); // Inherit everything from theme
else
return QStyle::standardPalette();