path: root/src/plugins/platforms/ios/
diff options
authorRichard Moe Gustavsen <>2016-09-06 14:36:20 +0200
committerRichard Moe Gustavsen <>2016-09-19 11:20:44 +0000
commitd3389a6d460a7d51a9672247366c60504f427b29 (patch)
tree0cc77ef720abf9a97d1b946a5fbf7ba2c3c677d1 /src/plugins/platforms/ios/
parente30d0e462f32d787a9d72acfef7026fb5019bb75 (diff)
iOS: let quiview conform to API signature changes in iOS 10
In the iOS 10 SDK, method signatures has been annotated with NS_ASSUME_NONNULL macros and 'nullable' keywords. This means that certain methods should not be called with argumens that can be null, or in this case, set to 0 explicitly. The result will be compiler warnings. This patch will rewrite the explicit call we do to touchesCancelled so that we send an empty set instead of 0. Change-Id: I50aa80b91312397d17e0e380815adff87cee852b Reviewed-by: Tor Arne Vestbø <>
Diffstat (limited to 'src/plugins/platforms/ios/')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/ b/src/plugins/platforms/ios/
index 4dd43be465..dce3098846 100644
--- a/src/plugins/platforms/ios/
+++ b/src/plugins/platforms/ios/
@@ -417,7 +417,8 @@
// We do this by assuming that there are no cases where a
// sub-set of the active touch events are intentionally cancelled.
- if (touches && (static_cast<NSInteger>([touches count]) != m_activeTouches.count()))
+ NSInteger count = static_cast<NSInteger>([touches count]);
+ if (count != 0 && count != m_activeTouches.count())
qWarning("Subset of active touches cancelled by UIKit");