Added QPlatformWindow

4 files changed, 13 insertions, 8 deletions

diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
index 693e0c3..2f03127 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
@@ -2,6 +2,7 @@
 #include "qwindowsurface_minimal.h"
 
 #include <QtGui/private/qpixmap_raster_p.h>
+#include <QtGui/QPlatformWindow>
 
 QMinimalIntegration::QMinimalIntegration()
 {
@@ -19,7 +20,9 @@ QPixmapData *QMinimalIntegration::createPixmapData(QPixmapData::PixelType type)
 {
     return new QRasterPixmapData(type);
 }
-QWindowSurface *QMinimalIntegration::createWindowSurface(QWidget *widget) const
+void QMinimalIntegration::createWindowAndSurface(QPlatformWindow**window, QWindowSurface**surface, QWidget *widget, WId winId) const
 {
-    return new QMinimalWindowSurface(widget);
+    qDebug() << "createWindow";
+    *surface = new QMinimalWindowSurface(widget);
+    *window = new QPlatformWindow(widget);
 }
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.h b/src/plugins/platforms/minimal/qplatformintegration_minimal.h
index d4eb78b..127c573 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.h
+++ b/src/plugins/platforms/minimal/qplatformintegration_minimal.h
@@ -72,7 +72,7 @@ public:
     QMinimalIntegration();
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
-    QWindowSurface *createWindowSurface(QWidget *widget) const;
+    void createWindowAndSurface(QPlatformWindow**window, QWindowSurface**surface, QWidget *widget, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }
 
diff --git a/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp b/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp
index 0b2bdd2..2f8b1f0 100644
--- a/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp
+++ b/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp
@@ -73,13 +73,13 @@ void QMinimalWindowSurface::flush(QWidget *widget, const QRegion &region, const
     mImage.save(filename);
 }
 
-void QMinimalWindowSurface::setGeometry(const QRect &rect)
+void QMinimalWindowSurface::resize(const QSize &size)
 {
     //qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect;
-    QWindowSurface::setGeometry(rect);
+    QWindowSurface::resize(size);
     QImage::Format format = QApplicationPrivate::platformIntegration()->screens().first()->format();
-    if (mImage.size() != rect.size())
-        mImage = QImage(rect.size(), format);
+    if (mImage.size() != size)
+        mImage = QImage(size, format);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qwindowsurface_minimal.h b/src/plugins/platforms/minimal/qwindowsurface_minimal.h
index 959a731..96f989d 100644
--- a/src/plugins/platforms/minimal/qwindowsurface_minimal.h
+++ b/src/plugins/platforms/minimal/qwindowsurface_minimal.h
@@ -44,6 +44,8 @@
 
 #include <QtGui/private/qwindowsurface_p.h>
 
+#include <QtGui/QPlatformWindow>
+
 QT_BEGIN_NAMESPACE
 
 class QMinimalWindowSurface : public QWindowSurface
@@ -54,7 +56,7 @@ public:
 
     QPaintDevice *paintDevice();
     void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
-    void setGeometry(const QRect &rect);
+    void resize(const QSize &size);
 
 private:
     QImage mImage;