aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-01-17 12:00:08 -0500
committerKen Moore <ken@ixsystems.com>2018-01-17 12:00:08 -0500
commitf1519a4377b6e553ac4e5c9b307a839ee9f6179a (patch)
tree71cf2144217161e7f86f1e3fcba412da7f5ea3b3
parentGet the QML reading the raw QImage data using the HTML data format (base64). (diff)
downloadlumina-f1519a4377b6e553ac4e5c9b307a839ee9f6179a.tar.gz
lumina-f1519a4377b6e553ac4e5c9b307a839ee9f6179a.tar.bz2
lumina-f1519a4377b6e553ac4e5c9b307a839ee9f6179a.zip
Add a failsafe setting into the 1.4.x lumina-desktop:
Ensure that the lumina theme engine is always set in the session environment unless manually replaced/removed in the session settings.
-rw-r--r--src-qt5/core/lumina-desktop/LSession.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index dab30f01..111a17b6 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -346,6 +346,8 @@ void LSession::watcherChange(QString changed){
//qDebug() << "Set Qt5 theme engine: " << engine;
if(engine.isEmpty()){ unsetenv("QT_QPA_PLATFORMTHEME"); }
else{ setenv("QT_QPA_PLATFORMTHEME", engine.toUtf8().data(),1); }
+ }else{
+ setenv("QT_QPA_PLATFORMTHEME", "lthemeengine",1); //ensure the lumina theme engine is always enabled
}
emit SessionConfigChanged();
}else if(changed.endsWith("desktopsettings.conf") ){ emit DesktopConfigChanged(); }
bgstack15