diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
| commit | 942ab490724fcc9544e786e5783718e1a07aa50b (patch) | |
| tree | feb7d3ff716edb37b2ca60e33c05adf8777bd964 /src/corelib/kernel/qeventdispatcher_win_p.h | |
| parent | 0fb8271a467202990c90321066e40faed640a7a8 (diff) | |
| parent | 24adaa9a742e6f95ff897d0eb9a2bce0527dd042 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/tools/tools.pri
Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_win_p.h')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index 683c7f8f36..a7ed8dda8a 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -195,6 +195,7 @@ public: HANDLE winEventNotifierActivatedEvent; QList<QWinEventNotifier *> winEventNotifierList; + bool winEventNotifierListModified = false; void activateEventNotifier(QWinEventNotifier * wen); QList<MSG> queuedUserInputEvents; |