summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/ios/qiosviewcontroller.mm
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-05-07 16:17:21 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-06-05 12:24:05 +0000
commita15db3a81aa6053d1b3ce346b4cb160c064a2c43 (patch)
tree69b6323b3d79207748ec3907dd9ff796818df92d /src/plugins/platforms/ios/qiosviewcontroller.mm
parent80583809041717f499c46aeb9b23f97562bcc9e5 (diff)
iOS: Guard all uses of APIs not available in application extensions
Change-Id: Ic058a0c07f6cdd0a015f46db96fce1536a712711 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qiosviewcontroller.mm')
-rw-r--r--src/plugins/platforms/ios/qiosviewcontroller.mm10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index d7db6ba856..aa909d6f63 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -41,6 +41,7 @@
#import "qiosviewcontroller.h"
#include <QtCore/qscopedvaluerollback.h>
+#include <QtCore/private/qcore_mac_p.h>
#include <QtGui/QGuiApplication>
#include <QtGui/QWindow>
@@ -307,15 +308,17 @@
{
[super viewDidLoad];
+ Q_ASSERT(!qt_apple_isApplicationExtension());
+
#ifndef Q_OS_TVOS
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
[center addObserver:self selector:@selector(willChangeStatusBarFrame:)
name:UIApplicationWillChangeStatusBarFrameNotification
- object:[UIApplication sharedApplication]];
+ object:qt_apple_sharedApplication()];
[center addObserver:self selector:@selector(didChangeStatusBarOrientation:)
name:UIApplicationDidChangeStatusBarOrientationNotification
- object:[UIApplication sharedApplication]];
+ object:qt_apple_sharedApplication()];
#endif
}
@@ -455,7 +458,6 @@
focusWindow = qt_window_private(focusWindow)->topLevelWindow();
#ifndef Q_OS_TVOS
- UIApplication *uiApplication = [UIApplication sharedApplication];
// -------------- Status bar style and visbility ---------------
@@ -479,6 +481,8 @@
// -------------- Content orientation ---------------
+ UIApplication *uiApplication = qt_apple_sharedApplication();
+
static BOOL kAnimateContentOrientationChanges = YES;
Qt::ScreenOrientation contentOrientation = focusWindow->contentOrientation();