summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-11-04 18:56:45 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:55:33 +0100
commit6d36a83b419e0b0bc0270e45983ed2bbfa453996 (patch)
tree61ceb12833f64b3481b138d5f8a421198ed0ae50
parent3020d06fdb9fd4e539876c9fb1945b50d55cc21d (diff)
iOS: Get rid of singleton instance accessor in platform plugin
None of the other platform plugins have one, and it's not used anywhere. Change-Id: Id46ab5f75c9819511c3e9d123d0338c3c8799869 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/plugins/platforms/ios/qiosintegration.h2
-rw-r--r--src/plugins/platforms/ios/qiosintegration.mm9
2 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index f44403fbba..ef839a89b0 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -52,8 +52,6 @@ public:
QIOSIntegration();
~QIOSIntegration();
- static QIOSIntegration *instance();
-
QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
QPlatformWindow *createPlatformWindow(QWindow *window) const;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 98b08ed72a..1b03b410cb 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -51,18 +51,9 @@
QT_BEGIN_NAMESPACE
-static QIOSIntegration *m_instance = 0;
-
-QIOSIntegration * QIOSIntegration::instance()
-{
- return m_instance;
-}
-
QIOSIntegration::QIOSIntegration()
:m_fontDb(new QCoreTextFontDatabase)
{
- if (!m_instance)
- m_instance = this;
m_screens << new QIOSScreen(0);
}