QPlatformWindow refactoring

and ported the directfb plugin to use QPlatformWindow

3 files changed, 13 insertions, 6 deletions

diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 567b551..6c97f07 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,4 +1,4 @@
-TARGET = qminimalgraphicssystem
+TARGET = qminimal
 include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
index 2f03127..404ffbc 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
@@ -20,9 +20,15 @@ QPixmapData *QMinimalIntegration::createPixmapData(QPixmapData::PixelType type)
 {
     return new QRasterPixmapData(type);
 }
-void QMinimalIntegration::createWindowAndSurface(QPlatformWindow**window, QWindowSurface**surface, QWidget *widget, WId winId) const
+
+QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWidget *widget, WId winId) const
+{
+    Q_UNUSED(winId);
+    return new QPlatformWindow(widget);
+}
+
+QWindowSurface *QMinimalIntegration::createWindowSurfaceForWindow(QWidget *widget, WId winId) const
 {
-    qDebug() << "createWindow";
-    *surface = new QMinimalWindowSurface(widget);
-    *window = new QPlatformWindow(widget);
+    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 127c573..2e8a8cf 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.h
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.h
@@ -72,7 +72,8 @@ public:
     QMinimalIntegration();
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
-    void createWindowAndSurface(QPlatformWindow**window, QWindowSurface**surface, QWidget *widget, WId winId) const;
+    QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
+    QWindowSurface *createWindowSurfaceForWindow(QWidget *widget, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }