Android: Do not override app_pal by AndroidPlatformTheme
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 Pick-to: 6.4 6.2 Change-Id: I6a3b7ee047fcd729be03271a7202cd260360f83b Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
parent
7cfc531382
commit
153a3245dc
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user