Commit 34e2ade7 authored by David Yip's avatar David Yip

Merge branch...

Merge branch '105-use-system-theme-no-longer-does-anything-on-kubuntu-18-04-also-probably-doesn-t-work-elsewhere' into 'master'

Resolve ""Use system theme" no longer does anything on Kubuntu 18.04; also probably doesn't work elsewhere"

Closes #105

See merge request !170
parents 79625485 dfe6ed42
Pipeline #3035 passed with stage
in 5 minutes and 55 seconds
......@@ -124,11 +124,6 @@ int main(int argc, char *argv[])
QSettings settings;
if (!settings.value(prefs::appearanceUseSystemStyles).toBool() ||
parser.isSet(QStringLiteral("clear-default-style"))) {
qunsetenv("QT_QUICK_CONTROLS_STYLE");
}
JJ_DO_OR_DIE(createOrMigrateApplicationDatabase(), "Unable to create application database");
QQmlApplicationEngine engine;
......@@ -187,10 +182,12 @@ int main(int argc, char *argv[])
context->setContextProperty(QStringLiteral("playerAccessStrategy"),
new CompositeAccessStrategy{&httpClient, &app});
// Workaround for QTBUG-72023; can probably be removed when we go to
// Qt 5.12.2
// clazy:excludeall=qcolor-from-literal
{
// If we're not using system styles, do our thing
if (!settings.value(prefs::appearanceUseSystemStyles).toBool()) {
// We'll provide our own style for Qt Quick Controls
qunsetenv("QT_QUICK_CONTROLS_STYLE");
// clazy:excludeall=qcolor-from-literal
QPalette pal;
pal.setColor(QPalette::Window, "#242424");
pal.setColor(QPalette::WindowText, "#3896df");
......
......@@ -19,13 +19,3 @@
#
[Controls]
Style=Fusion
[Fusion]
Palette\Window=#242424
Palette\WindowText=#3896df
Palette\Base=#2c2455
Palette\Highlight=#28417d
Palette\HighlightedText=#00b2ff
Palette\Text=#3896df
Palette\Button=#2c2455
Palette\ButtonText=#3896df
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment