diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:51:47 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-08 09:52:30 +0100 |
commit | 3dd88d367f4ddf44f45ae3e6edf649ca0939fbce (patch) | |
tree | fe65a9ecfa870d7abcf2201be76f7ff8f46fe997 /src | |
parent | 0b4bfe175739a0bd56f267fb598ccaec1176c678 (diff) | |
parent | 9eac4b1faf54c0b4761b7726d67d3e6abd8974f1 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12.6' into 5.12"
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 962b1d929f..91a186bace 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -630,10 +630,8 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") - (void)addInteraction:(id<UIInteraction>)interaction { - if (__builtin_available(iOS 13.0, *)) { - if ([interaction isKindOfClass:UITextInteraction.class]) - return; // Prevent iOS from adding UITextInteraction - } + if ([NSStringFromClass(interaction.class) isEqualToString:@"UITextInteraction"]) + return; [super addInteraction:interaction]; } |