3 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 8b27c60fec..f5f7176670 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -546,6 +546,7 @@ public:
         AA_DontShowShortcutsInContextMenus = 28,
         AA_CompressTabletEvents = 29,
         AA_DisableWindowContextHelpButton = 30, // ### Qt 6: remove me
+        AA_DisableSessionManager = 31,
 
         // Add new attributes before this line
         AA_AttributeCount
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 12e09d44e7..45d79902c7 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -286,6 +286,13 @@
            This value was added in Qt 5.10. In Qt 6, WindowContextHelpButtonHint
            will not be set by default.
 
+    \value AA_DisableSessionManager Disables the QSessionManager.
+           By default Qt will connect to a running session manager for a GUI
+           application on supported platforms, use of a session manager may be
+           redundant for system services.
+           This attribute must be set before QGuiApplication is constructed.
+           This value was added in 5.13
+
     The following values are deprecated or obsolete:
 
     \value AA_ImmediateWidgetCreation This attribute is no longer fully
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");
 }