Fix a problem with QDirectFBScreen::instance

If using a proxy screen QScreen::instance() will not return a
QDirectFBScreen but rather a QProxyScreen. This patch lets
QDirectFBScreen::instance hold its own pointer.

Reviewed-by: Jervey Kong <jervey.kong@nokia.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index 5e8c5c654f..437f1ae385 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -163,12 +163,7 @@ public:
     QWSWindowSurface *createSurface(QWidget *widget) const;
     QWSWindowSurface *createSurface(const QString &key) const;
 
-    static inline QDirectFBScreen *instance() {
-        QScreen *inst = QScreen::instance();
-        Q_ASSERT(!inst || inst->classId() == QScreen::DirectFBClass);
-        return static_cast<QDirectFBScreen*>(inst);
-    }
-
+    static QDirectFBScreen *instance();
     void waitIdle();
     IDirectFBSurface *surfaceForWidget(const QWidget *widget, QRect *rect) const;
 #ifdef QT_DIRECTFB_SUBSURFACE