diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2019-10-16 12:35:11 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2019-10-18 11:40:28 +0000 |
| commit | 45237fa54c482ca3f407d38dafb184f74cebc8c8 (patch) | |
| tree | 82339d2fe3b42ec758cd8bf8ee26c14580334398 | |
| parent | f470cc2da956899853482f76a461f24adf491e09 (diff) | |
iOS: Account for when the older SDK is used when building
Since the pre-built versions of Qt at this point are still built against
the iOS 12.x SDKs, then we need to account for this in order to have the
workaround implemented in e00d888daefbfbd5f17e0772421773f8e295087b still
working when deployed to an iOS 13 based device.
Change-Id: I649a453c549ee272de64624d68f9382276fcba64
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 631efee29371246ba1a1d9d007b23ca08b867191)
| -rw-r--r-- | src/plugins/platforms/ios/quiview.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h index e1d5d5af0c..343f102971 100644 --- a/src/plugins/platforms/ios/quiview.h +++ b/src/plugins/platforms/ios/quiview.h @@ -70,3 +70,8 @@ QT_END_NAMESPACE @property (nonatomic, readonly) UIEdgeInsets qt_safeAreaInsets; @end +#if !QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(130000) +@interface UITextInteraction : NSObject +@end +#endif + diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 4e3657ec37..962b1d929f 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -628,7 +628,6 @@ 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, *)) { @@ -638,7 +637,6 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") [super addInteraction:interaction]; } -#endif @end |