path: root/src/gui/kernel/qsessionmanager.cpp
diff options
authorDavid Edmundson <>2019-02-28 23:47:14 +0000
committerDavid Edmundson <>2019-03-01 01:15:43 +0000
commit404bee752c5058506900c23faa9d577a38b300f1 (patch)
tree2401e2c3738deda0f15af3d864a7c1090e9c00ae /src/gui/kernel/qsessionmanager.cpp
parent3b756bdcf52a33c33f5b7aa573912bb6bd70efbe (diff)
Add attribute to disable QSessionManager
Loading a session manager can be problemtatic for system services that are always auto-activated or small DBus activated helpers which shouldn't really be restored nor gain anything from a session. The current solutions is to connect to commitDataRequest and saveStateRequest and then reset a restart hint. It's very unintuitive and somewhat wasteful given the X session manager is full of slow blocking calls. Rather than changing the behavior of QGuiApplication and handling null pointers, this patch loads the base QPlatformSessionManager that is used by QPAs that don't have a session manager. Change-Id: I976521d551549e2d56076e968c6be5421e4a9c20 Reviewed-by: Albert Astals Cid <> Reviewed-by: Aleix Pol Gonzalez <> Reviewed-by: Frederik Gladhorn <>
Diffstat (limited to 'src/gui/kernel/qsessionmanager.cpp')
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qsessionmanager.cpp b/src/gui/kernel/qsessionmanager.cpp
index 493a321c74..e5e9c624b2 100644
--- a/src/gui/kernel/qsessionmanager.cpp
+++ b/src/gui/kernel/qsessionmanager.cpp
@@ -123,7 +123,11 @@ QSessionManagerPrivate::QSessionManagerPrivate(const QString &id,
const QString &key)
: QObjectPrivate()
- platformSessionManager = QGuiApplicationPrivate::platformIntegration()->createPlatformSessionManager(id, key);
+ if (qApp->testAttribute(Qt::AA_DisableSessionManager)) {
+ platformSessionManager = new QPlatformSessionManager(id, key);
+ } else {
+ platformSessionManager = QGuiApplicationPrivate::platformIntegration()->createPlatformSessionManager(id, key);
+ }
Q_ASSERT_X(platformSessionManager, "Platform session management",
"No platform session management, should use the default implementation");