diff --git a/src/main.cpp b/src/main.cpp index d401027e69c78021d8570925d064aa2d59d6c9b3..5ac223ed9937d8c6eb04640f4ce5edb7ae7c13c1 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 4c9de1c33e45f5275a70996638075627853efc80..3c526b93b59902a823d3dbcb2c8dedb5defc90b7 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(); }