diff options
author | Weblate <noreply@weblate.org> | 2017-07-19 18:47:39 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-07-19 18:47:39 +0000 |
commit | 86f6fadf45c2b87749cffac82411d2371448da53 (patch) | |
tree | dfc1520b8ae2e59118b8a65d3f9438c1eead6b2c /src-qt5/core/lumina-desktop-unified/main.cpp | |
parent | Add en_GB (diff) | |
parent | Another checkpoint in the compositing saga. Got most of it working, but still... (diff) | |
download | lumina-86f6fadf45c2b87749cffac82411d2371448da53.tar.gz lumina-86f6fadf45c2b87749cffac82411d2371448da53.tar.bz2 lumina-86f6fadf45c2b87749cffac82411d2371448da53.zip |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/main.cpp')
-rw-r--r-- | src-qt5/core/lumina-desktop-unified/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/main.cpp b/src-qt5/core/lumina-desktop-unified/main.cpp index 6141f1ea..0b67de46 100644 --- a/src-qt5/core/lumina-desktop-unified/main.cpp +++ b/src-qt5/core/lumina-desktop-unified/main.cpp @@ -8,10 +8,11 @@ #include "global-includes.h" #include "LSession.h" -#define DEBUG 0 +#define DEBUG 1 int main(int argc, char ** argv) { + qDebug() << "Starting lumina-desktop-unified..."; if (argc > 1) { if (QString(argv[1]) == QString("--version")){ qDebug() << LDesktopUtils::LuminaDesktopVersion(); @@ -27,8 +28,10 @@ int main(int argc, char ** argv) LXDG::setEnvironmentVars(); setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); + setenv("QT_NO_GLIB", "1", 1); //Disable the glib event loop within Qt at runtime (performance hit + bugs) unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... //Startup the session + if(DEBUG){ qDebug() << "Starting unified session"; } LSession a(argc, argv); if(!a.isPrimaryProcess()){ return 0; } QTime *timer=0; @@ -41,6 +44,6 @@ int main(int argc, char ** argv) theme.refresh(); if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;} int retCode = a.exec(); - qDebug() << "Finished Closing Down Lumina"; + qDebug() << "Finished Closing Down Unified Lumina"; return retCode; } |