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 /src/plugins | |
| 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 '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/main.mm | 2 | ||||
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 674a8da60a..ba6e3bdc43 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("macintosh")); + 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 5897815eec..a3f378799f 100644 --- a/src/plugins/styles/mac/macstyle.json +++ b/src/plugins/styles/mac/macstyle.json @@ -1,3 +1,3 @@ { - "Keys": [ "macintosh" ] + "Keys": [ "macos" ] } diff --git a/src/plugins/styles/mac/main.mm b/src/plugins/styles/mac/main.mm index ae31bb95fb..2f11b5cd43 100644 --- a/src/plugins/styles/mac/main.mm +++ b/src/plugins/styles/mac/main.mm @@ -53,7 +53,7 @@ public: QStyle *QMacStylePlugin::create(const QString &key) { QMacAutoReleasePool pool; - if (key.compare(QLatin1String("macintosh"), Qt::CaseInsensitive) == 0) + if (key.compare(QLatin1String("macos"), Qt::CaseInsensitive) == 0) return new QMacStyle(); return 0; 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(); |