diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-04 19:01:44 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:55:33 +0100 |
commit | 14e93f7e8e0ef58b0e47bfe277d52b2fa8f24ee7 (patch) | |
tree | c834807d82ee26ac18df37170186fd12aa33e696 /src | |
parent | 6d36a83b419e0b0bc0270e45983ed2bbfa453996 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/ios/qiosintegration.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 9 |
2 files changed, 3 insertions, 10 deletions
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); |