diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
| commit | 50908f023d83257dbc0b6d17bfe29e2f101615af (patch) | |
| tree | de68e2d9587db1fb59d75505981b6ff033e12992 /src/plugins/platforms/ios/qioswindow.mm | |
| parent | 7555a925816e3244073803f0adc4d44640f5ac1d (diff) | |
| parent | d10e4c193b0152350e884adcc1060aabd1a974f7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/platforms/ios/qiosviewcontroller.mm
Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index ae14d87a30..8ff0dfbd5f 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -93,7 +93,7 @@ QIOSWindow::~QIOSWindow() // practice this doesn't seem to happen when removing the view from its superview. To ensure that // Qt's internal state for touch and mouse handling is kept consistent, we therefor have to force // cancellation of all touch events. - [m_view touchesCancelled:0 withEvent:0]; + [m_view touchesCancelled:[NSSet set] withEvent:0]; clearAccessibleCache(); m_view->m_qioswindow = 0; |