1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Do not override app_pal by AndroidPlatformTheme

Browse Source 
It may happen that other styles (especially QtQucik styles) apply
different palette for applications. In such case AndroidPlatformTheme
should not override it when Light/Dark mode is changed

Task-number: QTBUG-83185
Change-Id: I6a3b7ee047fcd729be03271a7202cd260360f83b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 153a3245dcd5a986f5a2f4453d8d16da04663013)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Bartlomiej Moskal 2022-11-08 07:39:55 +01:00 committed by Qt Cherry-pick Bot
parent 1958c523e9
commit 1b9efeddb5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -396,7 +396,6 @@ void QAndroidPlatformTheme::updateStyle()
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Highlight, highlight.lighter(150)); m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Highlight, highlight.lighter(150));
loadAndroidStyle(&m_defaultPalette, m_androidStyleData); loadAndroidStyle(&m_defaultPalette, m_androidStyleData);
QGuiApplication::setPalette(m_defaultPalette);
} }
QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const