diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:20:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:21:33 +0100 |
| commit | d140f2f61499f424983582770af8c28399a373c1 (patch) | |
| tree | b05dc03863502293083ded9d61fc344ab5a9da7b /src/plugins/platforms/ios/quiview.mm | |
| parent | bf131e8d2181b3404f5293546ed390999f760404 (diff) | |
| parent | 8ffb200153d1b1a8402c875c4961160efb149201 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/widgets/widgets/scribble/mainwindow.cpp
This amends cb54c16584cf3be746a1a536c1e37cb3022a2f1b.
Change-Id: Iaae60a893330524b2973917e23b31f9d51f8bd38
Diffstat (limited to 'src/plugins/platforms/ios/quiview.mm')
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 4e3657ec37..91a186bace 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -628,17 +628,13 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") #endif } -#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(130000) - (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]; } -#endif @end |