diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:30:27 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:35:48 +0100 |
commit | 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f (patch) | |
tree | 2148abc88f8543eecdc0b97b2dd92594836af9b2 /src/plugins/platforms/windows/qwindowssessionmanager.h | |
parent | 036c5db468164297d213764c59a4b59daa76d90a (diff) | |
parent | 1c2be58fecaff1de5f2849192eb712984ebd59bd (diff) |
Merge remote-tracking branch 'origin/stable' into dev
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).
Conflicts:
configure
qmake/generators/win32/msvc_nmake.cpp
src/3rdparty/angle/src/libEGL/Surface.cpp
src/angle/src/common/common.pri
src/corelib/global/qglobal.h
src/corelib/io/qstandardpaths.cpp
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxscreeneventhandler.h
src/plugins/platforms/xcb/qglxintegration.h
src/widgets/kernel/win.pri
tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
tools/configure/configureapp.cpp
Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
Diffstat (limited to 'src/plugins/platforms/windows/qwindowssessionmanager.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowssessionmanager.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowssessionmanager.h b/src/plugins/platforms/windows/qwindowssessionmanager.h index 3e21cbabec..0443635c35 100644 --- a/src/plugins/platforms/windows/qwindowssessionmanager.h +++ b/src/plugins/platforms/windows/qwindowssessionmanager.h @@ -60,22 +60,21 @@ class QWindowsSessionManager : public QPlatformSessionManager { public: explicit QWindowsSessionManager(const QString &id, const QString &key); - virtual ~QWindowsSessionManager(); bool allowsInteraction() Q_DECL_OVERRIDE; bool allowsErrorInteraction() Q_DECL_OVERRIDE; - void blocksInteraction(); - bool isInterractionBlocked() const; + void blocksInteraction() { m_blockUserInput = true; } + bool isInteractionBlocked() const { return m_blockUserInput; } void release() Q_DECL_OVERRIDE; void cancel() Q_DECL_OVERRIDE; - void clearCancellation(); - bool wasCanceled() const; + void clearCancellation() { m_canceled = false; } + bool wasCanceled() const { return m_canceled; } - void setActive(bool active); - bool isActive() const; + void setActive(bool active) { m_isActive = active; } + bool isActive() const { return m_isActive;} private: bool m_isActive; |