diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-07-04 15:03:43 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-07-23 13:23:23 +0200 |
| commit | 66c47292bdf0843148b3c557321514d4d08c8ac6 (patch) | |
| tree | 67faab600601cb8c002603074e8906c5017f1898 /src/plugins/platforms/ios/qiosintegration.mm | |
| parent | 3770f4b1489b8d0d8fd6ffef23b8aac7dbf2e33b (diff) | |
iOS: Let QScreen manage UIWindow and root view-controller
Instead of having the application delegate set up a UIWindow and root
view-controller, we move the responsibility to QScreen, since in a multi
screen scenario we will need one UIWindow per screen, as well as one
root viewcontroller per window.
Change-Id: If5b0d44b8f8a697d830b33b4fe420bff56a7629b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qiosintegration.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 5ed37c3525..9a722ead37 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -72,7 +72,7 @@ QIOSIntegration *QIOSIntegration::instance() QIOSIntegration::QIOSIntegration() : m_fontDatabase(new QCoreTextFontDatabase) , m_clipboard(new QIOSClipboard) - , m_inputContext(new QIOSInputContext) + , m_inputContext(0) , m_platformServices(new QIOSServices) , m_accessibility(0) { @@ -91,6 +91,9 @@ QIOSIntegration::QIOSIntegration() for (UIScreen *screen in [UIScreen screens]) addScreen(new QIOSScreen(screen)); + // Depends on a primary screen being present + m_inputContext = new QIOSInputContext; + m_touchDevice = new QTouchDevice; m_touchDevice->setType(QTouchDevice::TouchScreen); m_touchDevice->setCapabilities(QTouchDevice::Position | QTouchDevice::NormalizedPosition); |