diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-14 16:45:58 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-18 15:31:10 +0200 |
| commit | 3b0c6bf486f9cd65200a9d771fb82e66df4de374 (patch) | |
| tree | 3d5f6998f63315a0e6b1435a43a0e7e974119a18 | |
| parent | 86bf3a4ddb4c6e131752eaac19e780b3207b6783 (diff) | |
QEventDispatcherCF: avoid QFlags->int implicit casts
Use toInt(), or an explicit cast. (I don't quite know why an atomic int
is involved here, but anyways, it makes these casts necessary.)
Change-Id: I8816ef96bd69a6f3e3f8e025e567e3451069462c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 2d2a7ee864..f8085f8991 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -366,7 +366,7 @@ bool QEventDispatcherCoreFoundation::processEvents(QEventLoop::ProcessEventsFlag // to do another pass. // But we should only wait for more events the first time - m_processEvents.flags &= ~QEventLoop::WaitForMoreEvents; + m_processEvents.flags &= ~int(QEventLoop::WaitForMoreEvents); continue; } else if (m_overdueTimerScheduled && !m_processEvents.processedTimers) { diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h index 2d76bf53da..b79c82264c 100644 --- a/src/corelib/kernel/qeventdispatcher_cf_p.h +++ b/src/corelib/kernel/qeventdispatcher_cf_p.h @@ -236,7 +236,7 @@ protected: struct ProcessEventsState { ProcessEventsState(QEventLoop::ProcessEventsFlags f) - : flags(f), wasInterrupted(false) + : flags(f.toInt()), wasInterrupted(false) , processedPostedEvents(false), processedTimers(false) , deferredWakeUp(false), deferredUpdateTimers(false) {} |