diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-04-09 15:41:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-10 08:59:12 +0000 |
| commit | 49a760e454158a666b09f9ca8eb54b4fb121aae5 (patch) | |
| tree | 3082a745752db7ee5e5885aadd49afa6d3a5a9d0 /src/plugins/platforms/ios | |
| parent | 32d9cf7310a874864799bec13c267fc503e79aba (diff) | |
iOS: Remove sending of duplicate touch events after broken merge
The merge in 0f315adf9199ef resulted in keeping both code paths,
in effect sending two touch events for each native touch event,
and also re-introduced the bug fixed by sending the touch events
asynchronously in some cases.
Change-Id: Id81f02d9597f4e0baeaddbdf9057fa32b6c31b2f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 584dfe9b41..29afae7176 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -439,7 +439,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") } if (m_activeTouches.isEmpty()) return; - QWindowSystemInterface::handleTouchEvent<QWindowSystemInterface::SynchronousDelivery>(m_qioswindow->window(), timeStamp, iosIntegration->touchDevice(), m_activeTouches.values()); + if (!static_cast<QUIWindow *>(self.window).sendingEvent) { // The event is likely delivered as part of delayed touch delivery, via // _UIGestureEnvironmentSortAndSendDelayedTouches, due to one of the two |