diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-06 13:09:57 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2017-10-15 16:14:04 +0000 |
commit | b5f2bf1a71d926b9bb04101b49a11fd641aad14f (patch) | |
tree | 664a311cc457f10d94f6cdb82500b0a32c33f5a5 /src/corelib/kernel/qwineventnotifier_p.h | |
parent | 1a039e89beecacaaf55c65e4e4cad5eaf94bb1a0 (diff) |
Fix QWinEventNotifier for auto-reset events
Auto-reset events are automatically reset to non-signaled when we get
notified about the signaled state. This implies that we cannot check the
event state again in activateEventNotifiers. Instead, store the signaled
state in a QAtomicInt and test and decrement that.
This amends commit 85403d0a.
Task-number: QTBUG-63555
Change-Id: I0adee3d2929783f98d91060f9106c8b5266d72fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/kernel/qwineventnotifier_p.h')
-rw-r--r-- | src/corelib/kernel/qwineventnotifier_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qwineventnotifier_p.h b/src/corelib/kernel/qwineventnotifier_p.h index bddeaaf134..8bb2c3159a 100644 --- a/src/corelib/kernel/qwineventnotifier_p.h +++ b/src/corelib/kernel/qwineventnotifier_p.h @@ -54,6 +54,7 @@ #include "qwineventnotifier.h" #include <private/qobject_p.h> +#include <QtCore/qatomic.h> #include <QtCore/qt_windows.h> QT_BEGIN_NAMESPACE @@ -73,6 +74,7 @@ public: HANDLE handleToEvent; HANDLE waitHandle = NULL; + QAtomicInt signaledCount; bool enabled; }; |