diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-04 19:49:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-04 19:49:26 +0100 |
| commit | 79dfc084375e52dde283e6b046b5894198e9f6a2 (patch) | |
| tree | 564ecca27993eafb920fa7597adb23c28132081e /src/plugins/platforms/ios | |
| parent | 6efbd4381ade816515bbde59f9d31df0241e1340 (diff) | |
| parent | 952c4fa25180e5f6180067bc8edd2abe6d81d053 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I644cd82b0d952b7d139e0228bf5017f147db77e7
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index dda8ee5b53..6960698bf1 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -59,6 +59,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") + (void)load { +#ifndef Q_OS_TVOS if (QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::IOS, 11)) { // iOS 11 handles this though [UIView safeAreaInsetsDidChange], but there's no signal for // the corresponding top and bottom layout guides that we use on earlier versions. Note @@ -73,6 +74,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") } ]; } +#endif } + (Class)layerClass |