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/gui/kernel/qplatformsessionmanager.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/gui/kernel/qplatformsessionmanager.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformsessionmanager.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformsessionmanager.cpp b/src/gui/kernel/qplatformsessionmanager.cpp index 6eb88a9450..97c40d863c 100644 --- a/src/gui/kernel/qplatformsessionmanager.cpp +++ b/src/gui/kernel/qplatformsessionmanager.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch> +** Copyright (C) 2013 Teo Mrnjavac <teo@kde.org> ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** @@ -42,6 +43,10 @@ #include "qplatformsessionmanager.h" +#include "qguiapplication_p.h" + +#ifndef QT_NO_SESSIONMANAGER + QT_BEGIN_NAMESPACE QPlatformSessionManager::QPlatformSessionManager(const QString &id, const QString &key) @@ -113,6 +118,12 @@ QStringList QPlatformSessionManager::discardCommand() const return m_discardCommand; } +void QPlatformSessionManager::setManagerProperty(const QString &name, const QString &value) +{ + Q_UNUSED(name) + Q_UNUSED(value) +} + void QPlatformSessionManager::setManagerProperty(const QString &name, const QStringList &value) { Q_UNUSED(name) @@ -128,4 +139,16 @@ void QPlatformSessionManager::requestPhase2() { } +void QPlatformSessionManager::appCommitData() +{ + qGuiApp->d_func()->commitData(); +} + +void QPlatformSessionManager::appSaveState() +{ + qGuiApp->d_func()->saveState(); +} + QT_END_NAMESPACE + +#endif // QT_NO_SESSIONMANAGER |