diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2013-09-18 11:49:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 07:45:44 +0200 |
| commit | ac0bacc8afc2f0ed3e1e1a19bdb469f8a4ec557e (patch) | |
| tree | 0bd9aa7905840d46b968dd08b9e59c1474c78157 /src/plugins/platforms/windows/qwindowsintegration.cpp | |
| parent | 2b65bba77d4705d49a01a25350de64d153808504 (diff) | |
Port of Qt 4's Windows session management
This patch aims to implement the session management for Windows.
Based on the Qt 4 QApplication windows specific code
Task-number: QTBUG-28228
Task-number: QTBUG-33032
Change-Id: I7059298ad9661aebd51e77a03f55a7a04f461479
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 5f1f9cf149..d7ac4cfc1e 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -1,5 +1,6 @@ /**************************************************************************** ** +** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch> ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** @@ -65,12 +66,15 @@ #endif #include "qwindowsinputcontext.h" #include "qwindowskeymapper.h" -# ifndef QT_NO_ACCESSIBILITY -#include "accessible/qwindowsaccessibility.h" +#ifndef QT_NO_ACCESSIBILITY +# include "accessible/qwindowsaccessibility.h" #endif #include <qpa/qplatformnativeinterface.h> #include <qpa/qwindowsysteminterface.h> +#if !defined(Q_OS_WINCE) && !defined(QT_NO_SESSIONMANAGER) +# include "qwindowssessionmanager.h" +#endif #include <QtGui/QBackingStore> #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qguiapplication_p.h> @@ -624,6 +628,13 @@ unsigned QWindowsIntegration::options() const return d->m_options; } +#if !defined(Q_OS_WINCE) && !defined(QT_NO_SESSIONMANAGER) +QPlatformSessionManager *QWindowsIntegration::createPlatformSessionManager(const QString &id, const QString &key) const +{ + return new QWindowsSessionManager(id, key); +} +#endif + QAbstractEventDispatcher * QWindowsIntegration::guiThreadEventDispatcher() const { return d->m_eventDispatcher; |