diff options
author | Andy Shaw <andy.shaw@qt.io> | 2019-10-25 06:57:32 +0000 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2019-10-25 07:16:48 +0000 |
commit | a7a24784eeba6747d319eb911583bdd99ef38cdb (patch) | |
tree | 39945a8c5399ebd815c96b29163049d9fbfdf478 /src/plugins/platforms | |
parent | c37af0ba2d886dcad15ec2baed2582c962c3c217 (diff) |
Revert "iOS: Account for when the older SDK is used when building"v5.13.2
This reverts commit 631efee29371246ba1a1d9d007b23ca08b867191.
Reason for revert: This causes a problem when running on iOS 11 devices.
Change-Id: If5194989b8d7a9f4cf2d72e770fdaad754d7e236
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/ios/quiview.h | 5 | ||||
-rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h index 343f102971..e1d5d5af0c 100644 --- a/src/plugins/platforms/ios/quiview.h +++ b/src/plugins/platforms/ios/quiview.h @@ -70,8 +70,3 @@ 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 962b1d929f..4e3657ec37 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -628,6 +628,7 @@ 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, *)) { @@ -637,6 +638,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") [super addInteraction:interaction]; } +#endif @end |