From 14e93f7e8e0ef58b0e47bfe277d52b2fa8f24ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Sun, 4 Nov 2012 19:01:44 +0100
Subject: iOS: Add screen like other platform plugins

We may add support for external displays at a later point, but for now
we follow the same pattern as the other platform plugins. Either way we
should call screenAdded() to let the platform integration know about the
screen.

Change-Id: Id01785a5262df0180caf957c7de8ecbbf169f233
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
 src/plugins/platforms/ios/qiosintegration.h  | 4 +---
 src/plugins/platforms/ios/qiosintegration.mm | 9 ++-------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index ef839a89b0..8b2ac70a9f 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -56,15 +56,13 @@ public:
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
 
-    QList<QPlatformScreen *> screens() const;
-
     QPlatformFontDatabase *fontDatabase() const;
 
     QAbstractEventDispatcher *guiThreadEventDispatcher() const;
 
 private:
-    QList<QPlatformScreen *> m_screens;
     QPlatformFontDatabase *m_fontDb;
+    QPlatformScreen *m_screen;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 1b03b410cb..68a9bf343f 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -52,9 +52,9 @@
 QT_BEGIN_NAMESPACE
 
 QIOSIntegration::QIOSIntegration()
-    :m_fontDb(new QCoreTextFontDatabase)
+    :m_fontDb(new QCoreTextFontDatabase), m_screen(new QIOSScreen(0))
 {
-    m_screens << new QIOSScreen(0);
+    screenAdded(m_screen);
 }
 
 QIOSIntegration::~QIOSIntegration()
@@ -74,11 +74,6 @@ QPlatformWindow *QIOSIntegration::createPlatformWindow(QWindow *window) const
     return new QIOSWindow(window);
 }
 
-QList<QPlatformScreen *> QIOSIntegration::screens() const
-{
-    return m_screens;
-}
-
 QPlatformBackingStore *QIOSIntegration::createPlatformBackingStore(QWindow *window) const
 {
     return new QIOSBackingStore(window);
-- 
cgit v1.2.3