diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
commit | 35ec3b49e1b0e7c72643a4e5b835bff57762f8cb (patch) | |
tree | 97bc6a16cca64905434647f810635cb143ad9aac /src/corelib | |
parent | 8bd0e6709f733a4934f32b4bd455eb1a46ff02d6 (diff) | |
parent | 2e94947c5602800b540fdabbb9c058a63f13e9d0 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I65e4457a218f333161e9e72735b62fc821475f45
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 304a7bda08..655fe58f98 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -309,6 +309,15 @@ int QAbstractEventDispatcher::registerTimer(int interval, Qt::TimerType timerTyp Wakes up the event loop. + \omit + ### FIXME - QTBUG-70229 + On Unix and Glib event dispatchers, if the dispatcher is already awake when + this function is called, it is ensured that the current iteration won't block + waiting for more events, but will instead do another event loop iteration. + + ### TODO - does other event dispatchers behave the same? + \endomit + \sa awake() */ |