From 43fa4b26870daffd4d44a42941bad141f6594db4 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 10 Sep 2020 14:49:22 +0200 Subject: QStyle: return 'Fusion' instead of 'fusion' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change should have no impact on Widgets, since style names there are case-insensitive. But for QtQuick controls the style names are case sensitive. So in order to use the style hint from the platform theme for controls, we need to return the name with an uppercase "F". Change-Id: I360f43f174938202b0ef2cdfcde6daf39c9f39bb Reviewed-by: Tor Arne Vestbø Reviewed-by: Mitch Curtis --- src/plugins/platforms/android/qandroidplatformtheme.cpp | 2 +- src/plugins/platforms/ios/qiostheme.mm | 2 +- src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 2 +- src/plugins/platforms/wasm/qwasmtheme.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp index d3a8a53241..9d7d84e09a 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp @@ -464,7 +464,7 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const && m_androidStyleData) { return QStringList(QLatin1String("android")); } - return QStringList(QLatin1String("fusion")); + return QStringList(QLatin1String("Fusion")); case DialogButtonBoxLayout: return QVariant(QPlatformDialogHelper::AndroidLayout); case MouseDoubleClickDistance: diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index 1360af9d76..584dd1c8fc 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -160,7 +160,7 @@ QVariant QIOSTheme::themeHint(ThemeHint hint) const { switch (hint) { case QPlatformTheme::StyleNames: - return QStringList(QStringLiteral("fusion")); + return QStringList(QStringLiteral("Fusion")); case KeyboardScheme: return QVariant(int(MacKeyboardScheme)); default: diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index b7df94e60d..811e025f62 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -173,7 +173,7 @@ public: { switch (h) { case StyleNames: - return QVariant(QStringList(QStringLiteral("fusion"))); + return QVariant(QStringList(QStringLiteral("Fusion"))); default: break; } diff --git a/src/plugins/platforms/wasm/qwasmtheme.cpp b/src/plugins/platforms/wasm/qwasmtheme.cpp index 978d60d686..4b99f90591 100644 --- a/src/plugins/platforms/wasm/qwasmtheme.cpp +++ b/src/plugins/platforms/wasm/qwasmtheme.cpp @@ -50,7 +50,7 @@ QWasmTheme::~QWasmTheme() QVariant QWasmTheme::themeHint(ThemeHint hint) const { if (hint == QPlatformTheme::StyleNames) - return QVariant(QStringList() << QLatin1String("fusion")); + return QVariant(QStringList() << QLatin1String("Fusion")); return QPlatformTheme::themeHint(hint); } -- cgit v1.2.3