From f9442d7c51f35362f22b39a53dd019e26884bfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 6 May 2011 12:12:00 +0200
Subject: [PATCH] Fixed compilation of Wayland plugin.

---
 .../platforms/wayland/qwaylandnativeinterface.cpp    | 12 ++++++------
 .../platforms/wayland/qwaylandnativeinterface.h      |  6 +++---
 src/plugins/platforms/wayland/wayland.pro            |  4 ++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
index c3bfba03cc..d056f75125 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
@@ -45,26 +45,26 @@
 #include "qwaylandwindow.h"
 #include <QtGui/private/qapplication_p.h>
 
-void *QWaylandNativeInterface::nativeResourceForWidget(const QByteArray &resourceString, QWidget *widget)
+void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
     QByteArray lowerCaseResource = resourceString.toLower();
 
     if (lowerCaseResource == "display")
-	return qPlatformScreenForWidget(widget)->display()->wl_display();
+	return qPlatformScreenForWindow(window)->display()->wl_display();
     if (lowerCaseResource == "surface") {
-	return ((QWaylandWindow *) widget->platformWindow())->wl_surface();
+	return ((QWaylandWindow *) window->handle())->wl_surface();
     }
 
     return NULL;
 }
 
 
-QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWidget(QWidget *widget)
+QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWindow(QWindow *window)
 {
     QWaylandScreen *screen;
 
-    if (widget) {
-        screen = static_cast<QWaylandScreen *>(QPlatformScreen::platformScreenForWidget(widget));
+    if (window) {
+        screen = static_cast<QWaylandScreen *>(QPlatformScreen::platformScreenForWindow(window));
     } else {
         screen = static_cast<QWaylandScreen *>(QApplicationPrivate::platformIntegration()->screens()[0]);
     }
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.h b/src/plugins/platforms/wayland/qwaylandnativeinterface.h
index ac4cdb9a22..dbb17a63a9 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.h
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.h
@@ -49,11 +49,11 @@
 class QWaylandNativeInterface : public QPlatformNativeInterface
 {
 public:
-    void *nativeResourceForWidget(const QByteArray &resourceString,
-				  QWidget *widget);
+    void *nativeResourceForWindow(const QByteArray &resourceString,
+				  QWindow *window);
 
 private:
-    static QWaylandScreen *qPlatformScreenForWidget(QWidget *widget);
+    static QWaylandScreen *qPlatformScreenForWindow(QWindow *window);
 };
 
 
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 3139232afe..fa93f8878b 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -33,6 +33,10 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
 
 INCLUDEPATH += $$PWD
 
+QT += gui-private
+QT += opengl-private
+QT += core-private
+
 include ($$PWD/gl_integration/gl_integration.pri)
 
 include (../fontdatabases/genericunix/genericunix.pri)