diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-24 15:41:42 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-31 12:35:45 +0000 |
commit | b02fe1bfe7bc5daa503dc3a274570aad0d8dca5a (patch) | |
tree | fe7ee1d385fd4da060d48569df721554f94db56e /src/plugins/platforms/ios/qiostextresponder.mm | |
parent | 29c0377f07f4942f9957ea87d59c252148dc9e5b (diff) |
Remove codepaths and checks for unsupported Apple platforms
We no longer support macOS 10.11, iOS/tvOS 10, or watchOS 3.
Change-Id: Ide03d8fac06185ef4162ba75ee54a0adf6916905
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qiostextresponder.mm')
-rw-r--r-- | src/plugins/platforms/ios/qiostextresponder.mm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm index 91a088ede1..396c769be8 100644 --- a/src/plugins/platforms/ios/qiostextresponder.mm +++ b/src/plugins/platforms/ios/qiostextresponder.mm @@ -244,17 +244,15 @@ self.inputAccessoryView = [[[WrapperView alloc] initWithView:accessoryView] autorelease]; #ifndef Q_OS_TVOS - if (__builtin_available(iOS 9, *)) { - if (platformData.value(kImePlatformDataHideShortcutsBar).toBool()) { - // According to the docs, leadingBarButtonGroups/trailingBarButtonGroups should be set to nil to hide the shortcuts bar. - // However, starting with iOS 10, the API has been surrounded with NS_ASSUME_NONNULL, which contradicts this and causes - // compiler warnings. Still it is the way to go to really hide the space reserved for that. + if (platformData.value(kImePlatformDataHideShortcutsBar).toBool()) { + // According to the docs, leadingBarButtonGroups/trailingBarButtonGroups should be set to nil to hide the shortcuts bar. + // However, starting with iOS 10, the API has been surrounded with NS_ASSUME_NONNULL, which contradicts this and causes + // compiler warnings. Still it is the way to go to really hide the space reserved for that. #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnonnull" - self.inputAssistantItem.leadingBarButtonGroups = nil; - self.inputAssistantItem.trailingBarButtonGroups = nil; + self.inputAssistantItem.leadingBarButtonGroups = nil; + self.inputAssistantItem.trailingBarButtonGroups = nil; #pragma clang diagnostic pop - } } #endif |