Re-enable Material style on Android

Breeze style seems to have significant font issues on some Android
devices.
This commit is contained in:
Bart De Vries 2023-03-16 21:02:33 +01:00
parent 02179c72be
commit 3935987705
3 changed files with 11 additions and 5 deletions

View File

@ -65,20 +65,20 @@ Q_DECL_EXPORT
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if (QSysInfo::currentCpuArchitecture().contains(QStringLiteral("arm")) && qEnvironmentVariableIsEmpty("QT_ENABLE_GLYPH_CACHE_WORKAROUND")) {
qputenv("QT_ENABLE_GLYPH_CACHE_WORKAROUND", "1");
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif #endif
if (QSysInfo::currentCpuArchitecture().contains(QStringLiteral("arm")) && qEnvironmentVariableIsEmpty("QT_ENABLE_GLYPH_CACHE_WORKAROUND")) {
qputenv("QT_ENABLE_GLYPH_CACHE_WORKAROUND", "1");
}
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
qInstallMessageHandler(myMessageHandler); qInstallMessageHandler(myMessageHandler);
QLoggingCategory::setFilterRules(QStringLiteral("org.kde.*=true")); QLoggingCategory::setFilterRules(QStringLiteral("org.kde.*=true"));
QQuickStyle::setStyle(QStringLiteral("org.kde.breeze")); QQuickStyle::setStyle(QStringLiteral("Material"));
#else #else
QApplication app(argc, argv); QApplication app(argc, argv);
if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) { if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {

View File

@ -0,0 +1,5 @@
[Material]
Primary=Blue
Accent=Blue
Theme=System
>

View File

@ -44,6 +44,7 @@
<file alias="GlobalSearchField.qml">qml/GlobalSearchField.qml</file> <file alias="GlobalSearchField.qml">qml/GlobalSearchField.qml</file>
<file alias="SearchFilterBar.qml">qml/SearchFilterBar.qml</file> <file alias="SearchFilterBar.qml">qml/SearchFilterBar.qml</file>
<file alias="FilterInlineMessage.qml">qml/FilterInlineMessage.qml</file> <file alias="FilterInlineMessage.qml">qml/FilterInlineMessage.qml</file>
<file>qtquickcontrols2.conf</file>
<file alias="logo.svg">../kasts.svg</file> <file alias="logo.svg">../kasts.svg</file>
<file alias="kasts-tray-light.svg">../icons/kasts-tray-light.svg</file> <file alias="kasts-tray-light.svg">../icons/kasts-tray-light.svg</file>
<file alias="kasts-tray-dark.svg">../icons/kasts-tray-dark.svg</file> <file alias="kasts-tray-dark.svg">../icons/kasts-tray-dark.svg</file>