diff options
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(); |