diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
commit | 4e40c54a3caabb6bced27e18e040ee88b739a3c8 (patch) | |
tree | bf33b7207326f516a119e72ca1c5e02e248206e0 /src/corelib/kernel | |
parent | fbda189e081e6c7abf82334c0ac71b16ec2c37dd (diff) | |
parent | 9e59024bf80124dbf301e8b3dca3dc4548fee428 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I77ba01f09b3dbcaf13cb265a70d9da661c32a61f
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 33c231987f..b9e334f1f4 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -423,7 +423,7 @@ bool QEventDispatcherCoreFoundation::processPostedEvents() m_processEvents.processedPostedEvents = true; qCDebug(lcEventDispatcher) << "Sending posted events for" - << QEventLoop::ProcessEventsFlags(m_processEvents.flags.load()); + << QEventLoop::ProcessEventsFlags(m_processEvents.flags.loadRelaxed()); QCoreApplication::sendPostedEvents(); return true; |