diff options
| author | David Faure <faure+bluesystems@kde.org> | 2012-11-23 15:29:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 16:21:57 +0100 |
| commit | eca4936ea213536966738d6fd4e076b493afa5b4 (patch) | |
| tree | 7c5964b8c186b0910711e863e967df21cd31ef76 /src/gui/kernel/qsessionmanager.h | |
| parent | b9c8cf2527fbbcfad194bd84f869cf0fa03ae8fd (diff) | |
Move session management code from QApplication to QGuiApplication.
QSessionManager was already in QtGui, but not usable since the only API
to get to it was still in QtWidgets. Session management isn't related
to widgets, it also applies to QML apps on the desktop.
The virtual commitData and saveState methods have been removed,
given the two signals which exist since 4.2, and an additional
isSessionSaving() method was added instead.
Change-Id: I8099e70df133303e74456706827da21f013fcc6a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/kernel/qsessionmanager.h')
| -rw-r--r-- | src/gui/kernel/qsessionmanager.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index f02810cdcd..cf46434582 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h @@ -95,9 +95,8 @@ public: void requestPhase2(); private: - friend class QApplication; - friend class QApplicationPrivate; - friend class QBaseApplication; + friend class QGuiApplication; + friend class QGuiApplicationPrivate; }; QT_END_NAMESPACE |