5 files changed, 24 insertions, 27 deletions
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index d51b6b2ed0..53ae1b1319 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -6,9 +6,9 @@ DESTDIR = $$QT.gui.plugins/platforms
 
 SOURCES =   main.cpp \
             qminimalintegration.cpp \
-            qminimalwindowsurface.cpp
+            qminimalbackingstore.cpp
 HEADERS =   qminimalintegration.h \
-            qminimalwindowsurface.h
+            qminimalbackingstore.h
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
diff --git a/src/plugins/platforms/minimal/qminimalwindowsurface.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
index f28b34a000..bd4f04dfcd 100644
--- a/src/plugins/platforms/minimal/qminimalwindowsurface.cpp
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
@@ -40,29 +40,29 @@
 ****************************************************************************/
 
 
-#include "qminimalwindowsurface.h"
+#include "qminimalbackingstore.h"
 #include <QtCore/qdebug.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
-QMinimalWindowSurface::QMinimalWindowSurface(QWindow *window)
-    : QWindowSurface(window)
+QMinimalBackingStore::QMinimalBackingStore(QWindow *window)
+    : QPlatformBackingStore(window)
 {
-    //qDebug() << "QMinimalWindowSurface::QMinimalWindowSurface:" << (long)this;
+    //qDebug() << "QMinimalBackingStore::QMinimalBackingStore:" << (long)this;
 }
 
-QMinimalWindowSurface::~QMinimalWindowSurface()
+QMinimalBackingStore::~QMinimalBackingStore()
 {
 }
 
-QPaintDevice *QMinimalWindowSurface::paintDevice()
+QPaintDevice *QMinimalBackingStore::paintDevice()
 {
-    //qDebug() << "QMinimalWindowSurface::paintDevice";
+    //qDebug() << "QMinimalBackingStore::paintDevice";
     return &mImage;
 }
 
-void QMinimalWindowSurface::flush(QWindow *window, const QRegion &region, const QPoint &offset)
+void QMinimalBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
 {
     Q_UNUSED(window);
     Q_UNUSED(region);
@@ -70,14 +70,13 @@ void QMinimalWindowSurface::flush(QWindow *window, const QRegion &region, const
 
     static int c = 0;
     QString filename = QString("output%1.png").arg(c++, 4, 10, QLatin1Char('0'));
-    qDebug() << "QMinimalWindowSurface::flush() saving contents to" << filename.toLocal8Bit().constData();
+    qDebug() << "QMinimalBackingStore::flush() saving contents to" << filename.toLocal8Bit().constData();
     mImage.save(filename);
 }
 
-void QMinimalWindowSurface::resize(const QSize &size)
+void QMinimalBackingStore::resize(const QSize &size, const QRegion &)
 {
-    //qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect;
-    QWindowSurface::resize(size);
+    //qDebug() << "QMinimalBackingStore::setGeometry:" << (long)this << rect;
     QImage::Format format = QGuiApplicationPrivate::platformIntegration()->screens().first()->format();
     if (mImage.size() != size)
         mImage = QImage(size, format);
diff --git a/src/plugins/platforms/minimal/qminimalwindowsurface.h b/src/plugins/platforms/minimal/qminimalbackingstore.h
index 943cdc43e1..9b61275e9d 100644
--- a/src/plugins/platforms/minimal/qminimalwindowsurface.h
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.h
@@ -39,25 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QWINDOWSURFACE_MINIMAL_H
-#define QWINDOWSURFACE_MINIMAL_H
-
-#include <QtGui/private/qwindowsurface_p.h>
+#ifndef QBACKINGSTORE_MINIMAL_H
+#define QBACKINGSTORE_MINIMAL_H
 
+#include <QtGui/QPlatformBackingStore>
 #include <QtGui/QPlatformWindow>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
 
-class QMinimalWindowSurface : public QWindowSurface
+class QMinimalBackingStore : public QPlatformBackingStore
 {
 public:
-    QMinimalWindowSurface(QWindow *window);
-    ~QMinimalWindowSurface();
+    QMinimalBackingStore(QWindow *window);
+    ~QMinimalBackingStore();
 
     QPaintDevice *paintDevice();
     void flush(QWindow *window, const QRegion &region, const QPoint &offset);
-    void resize(const QSize &size);
+    void resize(const QSize &size, const QRegion &staticContents);
 
 private:
     QImage mImage;
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index 23bade99b6..c3300ce3b8 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qminimalintegration.h"
-#include "qminimalwindowsurface.h"
+#include "qminimalbackingstore.h"
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/QPlatformWindow>
@@ -75,8 +75,7 @@ QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWindow *window) cons
     return new QPlatformWindow(window);
 }
 
-QWindowSurface *QMinimalIntegration::createWindowSurface(QWindow *window, WId winId) const
+QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow *window) const
 {
-    Q_UNUSED(winId);
-    return new QMinimalWindowSurface(window);
+    return new QMinimalBackingStore(window);
 }
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h
index 6ac45c2385..efb0f352d4 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
@@ -73,7 +73,7 @@ public:
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
-    QWindowSurface *createWindowSurface(QWindow *window, WId winId) const;
+    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }