From 060b862b614285aae88540895736a57eb8563102 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 11 Sep 2013 17:22:45 +0200 Subject: Bring back Qt4 X11 session management functionality. Added QXcbSessionManager to the Xcb plugin. QXcbSessionManager inherits from QPlatformSessionManager, it's a port of QSessionManager as it is in Qt 4.8. Minor changes also in QPlatformSessionManager and QGuiApplication to hook it up. Task-number: QTBUG-28228 Task-number: QTBUG-30011 Task-number: QTBUG-33033 Change-Id: I50b33d05a1e32c5278dea339f693713acc870a70 Reviewed-by: Friedemann Kleint Reviewed-by: David Faure --- src/gui/kernel/qguiapplication.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/gui/kernel/qguiapplication.h') diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index a0aef83eed..bd42f18418 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -184,6 +184,9 @@ private: #endif friend class QFontDatabasePrivate; friend class QPlatformIntegration; +#ifndef QT_NO_SESSIONMANAGER + friend class QPlatformSessionManager; +#endif }; QT_END_NAMESPACE -- cgit v1.2.3