diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 07:14:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 07:14:40 +0200 |
| commit | d10e4c193b0152350e884adcc1060aabd1a974f7 (patch) | |
| tree | 23b553e40575d4660709fe8765dcb77e3625103d /src/plugins/platforms/ios/qioswindow.mm | |
| parent | 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 (diff) | |
| parent | 25e9bde2d665866f7a9a40d1ed3aa8fabcf2ac2f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9cfefaf22b010fca937be77979f5fb50574bb71e
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 ddf856d7a4..8099d13147 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -91,7 +91,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; |