diff options
| author | Teo Mrnjavac <teo@kde.org> | 2013-09-11 17:22:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 11:47:06 +0200 |
| commit | 060b862b614285aae88540895736a57eb8563102 (patch) | |
| tree | 40d564877eb856e8f7d840d992552b00b8a1cd0c /src/plugins/platforms/xcb/qxcbintegration.cpp | |
| parent | f4ebb061899da67aa26c08516fa7ee8c7b11dcbf (diff) | |
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 <Friedemann.Kleint@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 68ad93143b..e10c556473 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -50,6 +50,10 @@ #include "qxcbclipboard.h" #include "qxcbdrag.h" +#ifndef QT_NO_SESSIONMANAGER +#include "qxcbsessionmanager.h" +#endif + #include <xcb/xcb.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> @@ -439,4 +443,11 @@ QByteArray QXcbIntegration::wmClass() const return m_wmClass; } +#ifndef QT_NO_SESSIONMANAGER +QPlatformSessionManager *QXcbIntegration::createPlatformSessionManager(const QString &id, const QString &key) const +{ + return new QXcbSessionManager(id, key); +} +#endif + QT_END_NAMESPACE |