From dfae73d0d66b926b1786423310cccef8d542f2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 11 Feb 2022 12:11:38 -0500
Subject: [PATCH] misc: remove code duplication and use native theme on KDE
GitLab: #603
Change-Id: I271f6d4b9b8089dc88479f1d7d98514acb3d52be
---
src/main.cpp | 4 +++-
src/mainapplication.cpp | 5 -----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index d401027e6..5ac223ed9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,7 +62,9 @@ main(int argc, char* argv[])
QList<char*> qtWebEngineChromiumFlags;
#ifdef Q_OS_LINUX
- setenv("QT_QPA_PLATFORMTHEME", "gtk3", true);
+ if (!getenv("QT_QPA_PLATFORMTHEME")
+ && !(getenv("XDG_CURRENT_DESKTOP") == "KDE" || getenv("XDG_CURRENT_DESKTOP") == "GNOME"))
+ setenv("QT_QPA_PLATFORMTHEME", "gtk3", true);
setenv("QML_DISABLE_DISK_CACHE", "1", true);
/*
diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp
index 4c9de1c33..3c526b93b 100644
--- a/src/mainapplication.cpp
+++ b/src/mainapplication.cpp
@@ -165,11 +165,6 @@ MainApplication::init()
setWindowIcon(QIcon(":/images/jami.ico"));
-#ifdef Q_OS_LINUX
- if (!getenv("QT_QPA_PLATFORMTHEME"))
- setenv("QT_QPA_PLATFORMTHEME", "gtk3", true);
-#endif
-
if (runOptions_[Option::Debug].toBool()) {
consoleDebug();
}
--
GitLab