Minimal plugin works again.
authorPaul Olav Tvete <paul.tvete@nokia.com>
Fri, 29 Apr 2011 10:59:23 +0000 (12:59 +0200)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Fri, 29 Apr 2011 10:59:23 +0000 (12:59 +0200)
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/minimal/qminimalintegration.h

index 3a545e4..88255cb 100644 (file)
@@ -69,14 +69,14 @@ QPixmapData *QMinimalIntegration::createPixmapData(QPixmapData::PixelType type)
     return new QRasterPixmapData(type);
 }
 
-QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWidget *widget, WId winId) const
+QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWindow *window) const
 {
-    Q_UNUSED(winId);
-    return new QPlatformWindow(widget);
+    Q_UNUSED(window);
+    return new QPlatformWindow(window);
 }
 
-QWindowSurface *QMinimalIntegration::createWindowSurface(QWidget *widget, WId winId) const
+QWindowSurface *QMinimalIntegration::createWindowSurface(QWindow *window, WId winId) const
 {
     Q_UNUSED(winId);
-    return new QMinimalWindowSurface(widget);
+    return new QMinimalWindowSurface(window->widget());
 }
index 5f93443..7191441 100644 (file)
@@ -72,8 +72,8 @@ public:
     bool hasCapability(QPlatformIntegration::Capability cap) const;
 
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
-    QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
-    QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
+    QPlatformWindow *createPlatformWindow(QWindow *window) const;
+    QWindowSurface *createWindowSurface(QWindow *window, WId winId) const;
 
     QList<QPlatformScreen *> screens() const { return mScreens; }