diff options
| author | Ken Moore <ken@pcbsd.org> | 2016-10-05 17:56:20 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2016-10-05 17:56:20 -0400 |
| commit | 8ff34b38ac1f8f7be5967670978ff35b7da1f9d7 (patch) | |
| tree | b59d94a503da058a34bb15c2467b844749567a1e /src-qt5/core/lumina-session/session.cpp | |
| parent | Add a new Lumina project: desktop-utils/lumina-calculator (diff) | |
| parent | Convert over the desktop/panel settings to be based on screen ID instead of s... (diff) | |
| download | lumina-8ff34b38ac1f8f7be5967670978ff35b7da1f9d7.tar.gz lumina-8ff34b38ac1f8f7be5967670978ff35b7da1f9d7.tar.bz2 lumina-8ff34b38ac1f8f7be5967670978ff35b7da1f9d7.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-session/session.cpp')
| -rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 937f05d0..20c55ec4 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -11,6 +11,8 @@ #include <QProcessEnvironment> #include <QDebug> #include <QSettings> +#include <QDir> + #include <LuminaUtils.h> #include <LuminaOS.h> @@ -56,6 +58,13 @@ void LSession::startProcess(QString ID, QString command, QStringList watchfiles) proc->setProcessChannelMode(QProcess::MergedChannels); proc->setProcessEnvironment( QProcessEnvironment::systemEnvironment() ); proc->setStandardOutputFile(logfile); + if(ID=="runtime"){ + //Bypass for a hidden dbus requirement for Qt itself (Qt 5.5.1) + QDir tmp = QDir::temp(); + if( tmp.entryList(QStringList() << "dbus-*").isEmpty() && LUtils::isValidBinary("dbus-launch")){ + command.prepend("dbus-launch --exit-with-session "); + } + } proc->start(command, QIODevice::ReadOnly); connect(proc, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(procFinished()) ); PROCS << proc; |