Renamed createWindowSurfaceForWindow

to createWindowSurface. Gave also a default dpi when there is no
platform integration, ie. it has not been initialised yet or is being
initialised.

16 files changed, 36 insertions, 32 deletions

diff --git a/src/gui/kernel/qplatformintegration_lite.h b/src/gui/kernel/qplatformintegration_lite.h
index b13260e..ee6f833 100644
--- a/src/gui/kernel/qplatformintegration_lite.h
+++ b/src/gui/kernel/qplatformintegration_lite.h
@@ -63,7 +63,7 @@ public:
 // GraphicsSystem functions
     virtual QPixmapData *createPixmapData(QPixmapData::PixelType type) const = 0;
     virtual QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId = 0) const = 0;
-    virtual QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const = 0;
+    virtual QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const = 0;
     virtual QBlittable *createBlittable(const QSize &size) const;
 
 // Window System functions
diff --git a/src/gui/kernel/qwidget_lite.cpp b/src/gui/kernel/qwidget_lite.cpp
index 465dbee..ee1a582 100644
--- a/src/gui/kernel/qwidget_lite.cpp
+++ b/src/gui/kernel/qwidget_lite.cpp
@@ -77,7 +77,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     Q_ASSERT(platformWindow);
 
     if (!surface) {
-        surface = QApplicationPrivate::platformIntegration()->createWindowSurfaceForWindow(q,platformWindow->winId());
+        surface = QApplicationPrivate::platformIntegration()->createWindowSurface(q,platformWindow->winId());
     }
     Q_ASSERT(surface);
 
diff --git a/src/gui/painting/qgraphicssystem_lite.cpp b/src/gui/painting/qgraphicssystem_lite.cpp
index 68d880b..1d24129 100644
--- a/src/gui/painting/qgraphicssystem_lite.cpp
+++ b/src/gui/painting/qgraphicssystem_lite.cpp
@@ -51,7 +51,7 @@ QPixmapData *QLiteGraphicsSystem::createPixmapData(QPixmapData::PixelType type)
 
 QWindowSurface *QLiteGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
-    return QApplicationPrivate::platformIntegration()->createWindowSurfaceForWindow(widget, widget->winId());
+    return QApplicationPrivate::platformIntegration()->createWindowSurface(widget, widget->winId());
 }
 
 QBlittable *QLiteGraphicsSystem::createBlittable(const QSize &size) const
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 81d431c..2c2ceb1 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -177,10 +177,16 @@ Q_GUI_EXPORT int qt_defaultDpiX()
         screen = subScreens.at(0);
     dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4)));
 #elif defined(Q_WS_LITE)
-    QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
-    const QSize screenSize = screen->geometry().size();
-    const QSize physicalSize = screen->physicalSize();
-    dpi = qRound(screenSize.width() / (physicalSize.width() / qreal(25.4)));
+    QPlatformIntegration *pi = QApplicationPrivate::platformIntegration();
+    if (pi) {
+        QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
+        const QSize screenSize = screen->geometry().size();
+        const QSize physicalSize = screen->physicalSize();
+        dpi = qRound(screenSize.width() / (physicalSize.width() / qreal(25.4)));
+    } else {
+        //PI has not been initialised, or it is being initialised. Give a default dpi
+        dpi = 100;
+    }
 #elif defined(Q_OS_SYMBIAN)
     dpi = S60->defaultDpiX;
 #endif // Q_WS_X11
@@ -210,10 +216,16 @@ Q_GUI_EXPORT int qt_defaultDpiY()
         screen = subScreens.at(0);
     dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4)));
 #elif defined(Q_WS_LITE)
-    QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
-    const QSize screenSize = screen->geometry().size();
-    const QSize physicalSize = screen->physicalSize();
-    dpi = qRound(screenSize.height() / (physicalSize.height() / qreal(25.4)));
+    QPlatformIntegration *pi = QApplicationPrivate::platformIntegration();
+    if (pi) {
+        QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
+        const QSize screenSize = screen->geometry().size();
+        const QSize physicalSize = screen->physicalSize();
+        dpi = qRound(screenSize.height() / (physicalSize.height() / qreal(25.4)));
+    } else {
+        //PI has not been initialised, or it is being initialised. Give a default dpi
+        dpi = 100;
+    }
 #elif defined(Q_OS_SYMBIAN)
     dpi = S60->defaultDpiY;
 #endif // Q_WS_X11
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index b096081..60fce7e 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -112,7 +112,7 @@ QPlatformWindow *QDirectFbIntegration::createPlatformWindow(QWidget *widget, WId
     return new QDirectFbWindow(widget);
 }
 
-QWindowSurface *QDirectFbIntegration::createWindowSurfaceForWindow(QWidget *widget, WId winId) const
+QWindowSurface *QDirectFbIntegration::createWindowSurface(QWidget *widget, WId winId) const
 {
     return new QDirectFbWindowSurface(widget,winId);
 }
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index 808bc9d..c0e770f 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -84,7 +84,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId = 0) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
     QBlittable *createBlittable(const QSize &size) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }
diff --git a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp
index 25cdc7b..acc254a 100644
--- a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp
+++ b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp
@@ -786,10 +786,8 @@ QPixmapData *QLinuxFbIntegration::createPixmapData(QPixmapData::PixelType type)
     return new QRasterPixmapData(type);
 }
 
-QWindowSurface *QLinuxFbIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QLinuxFbIntegration::createWindowSurface(QWidget *widget, WId) const
 {
-    if (widget->windowType() == Qt::Desktop)
-        return 0;   // Don't create an explicit window surface for the destkop.
     QFbWindowSurface * surface =
         new QFbWindowSurface(mPrimaryScreen, widget);
     return surface;
diff --git a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h
index 7d4c031..dc61df5 100644
--- a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h
+++ b/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h
@@ -78,7 +78,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId WinId) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId WinId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId WinId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }
 
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
index 94aa4f3..73e025c 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
@@ -26,7 +26,7 @@ QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWidget *widget, WId
     return new QPlatformWindow(widget);
 }
 
-QWindowSurface *QMinimalIntegration::createWindowSurfaceForWindow(QWidget *widget, WId winId) const
+QWindowSurface *QMinimalIntegration::createWindowSurface(QWidget *widget, WId winId) const
 {
     Q_UNUSED(winId);
     return new QMinimalWindowSurface(widget);
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.h b/src/plugins/platforms/minimal/qplatformintegration_minimal.h
index fefe6c3..a2f7449 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.h
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.h
@@ -72,7 +72,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }
 
diff --git a/src/plugins/platforms/qvfb/qvfbintegration.cpp b/src/plugins/platforms/qvfb/qvfbintegration.cpp
index 2a877e0..e22c724 100644
--- a/src/plugins/platforms/qvfb/qvfbintegration.cpp
+++ b/src/plugins/platforms/qvfb/qvfbintegration.cpp
@@ -421,10 +421,8 @@ QPixmapData *QVFbIntegration::createPixmapData(QPixmapData::PixelType type) cons
     return new QRasterPixmapData(type);
 }
 
-QWindowSurface *QVFbIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QVFbIntegration::createWindowSurface(QWidget *widget, WId) const
 {
-    if (widget->windowType() == Qt::Desktop)
-        return 0;   // Don't create an explicit window surface for the destkop.
     return new QVFbWindowSurface(mPrimaryScreen, widget);
 }
 
@@ -436,4 +434,4 @@ QPlatformWindow *QVFbIntegration::createPlatformWindow(QWidget *widget, WId) con
 
 QT_END_NAMESPACE
 
-#include "qgraphicssystem_qvfb.moc"
+#include "qvfbintegration.moc"
diff --git a/src/plugins/platforms/qvfb/qvfbintegration.h b/src/plugins/platforms/qvfb/qvfbintegration.h
index 1207678..ab44d46 100644
--- a/src/plugins/platforms/qvfb/qvfbintegration.h
+++ b/src/plugins/platforms/qvfb/qvfbintegration.h
@@ -80,7 +80,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }
 
diff --git a/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp b/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp
index f13951d..f657617 100644
--- a/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp
+++ b/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp
@@ -103,10 +103,8 @@ QPixmapData *QTestLiteIntegration::createPixmapData(QPixmapData::PixelType type)
     return new QRasterPixmapData(type);
 }
 
-QWindowSurface *QTestLiteIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QTestLiteIntegration::createWindowSurface(QWidget *widget, WId) const
 {
-    if (widget->windowType() == Qt::Desktop)
-        return 0;   // Don't create an explicit window surface for the destkop.
     return new QTestLiteWindowSurface(mPrimaryScreen, widget);
 }
 
diff --git a/src/plugins/platforms/testlite/qplatformintegration_testlite.h b/src/plugins/platforms/testlite/qplatformintegration_testlite.h
index bd27d89..729e74f 100644
--- a/src/plugins/platforms/testlite/qplatformintegration_testlite.h
+++ b/src/plugins/platforms/testlite/qplatformintegration_testlite.h
@@ -75,7 +75,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
 
     QPixmap grabWindow(WId window, int x, int y, int width, int height) const;
 
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
index cbc8bbd..a872991 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
+++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
@@ -114,10 +114,8 @@ QPixmapData *QVNCIntegration::createPixmapData(QPixmapData::PixelType type) cons
 //     return surface;
 // }
 
-QWindowSurface *QVNCIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QVNCIntegration::createWindowSurface(QWidget *widget, WId) const
 {
-    if (widget->windowType() == Qt::Desktop)
-        return 0;   // Don't create an explicit window surface for the destkop.
     QFbWindowSurface * surface;
     surface = new QFbWindowSurface(mPrimaryScreen, widget);
     return surface;
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
index 887ccc3..524b888 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
+++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
@@ -80,7 +80,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
-    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }