From 5dc3a46a2ac56321a888ada4c15d95cabd3a4159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 9 May 2011 14:08:19 +0200
Subject: Wayland plugin compile fixes.

---
 src/opengl/qgl_p.h                                        | 2 +-
 src/plugins/platforms/wayland/qwaylandnativeinterface.cpp | 4 ++--
 src/plugins/platforms/wayland/qwaylandshmsurface.cpp      | 1 -
 src/plugins/platforms/wayland/wayland.pro                 | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 26b2ab3a90..7f2873b478 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -60,7 +60,7 @@
 #include "QtCore/qthreadstorage.h"
 #include "QtCore/qhash.h"
 #include "QtCore/qatomic.h"
-#include "private/qwidget_p.h"
+#include "QtWidgets/private/qwidget_p.h"
 #include "qcache.h"
 #include "qglpaintdevice_p.h"
 
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
index d056f75125..8a7799e7a9 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
@@ -43,7 +43,7 @@
 
 #include "qwaylanddisplay.h"
 #include "qwaylandwindow.h"
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 
 void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
@@ -66,7 +66,7 @@ QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWindow(QWindow *wind
     if (window) {
         screen = static_cast<QWaylandScreen *>(QPlatformScreen::platformScreenForWindow(window));
     } else {
-        screen = static_cast<QWaylandScreen *>(QApplicationPrivate::platformIntegration()->screens()[0]);
+        screen = static_cast<QWaylandScreen *>(QGuiApplicationPrivate::platformIntegration()->screens()[0]);
     }
     return screen;
 }
diff --git a/src/plugins/platforms/wayland/qwaylandshmsurface.cpp b/src/plugins/platforms/wayland/qwaylandshmsurface.cpp
index 69e5076a50..4bc54399ee 100644
--- a/src/plugins/platforms/wayland/qwaylandshmsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshmsurface.cpp
@@ -41,7 +41,6 @@
 #include "qwaylandshmsurface.h"
 
 #include <QtCore/qdebug.h>
-#include <QtGui/private/qapplication_p.h>
 
 #include "qwaylanddisplay.h"
 #include "qwaylandshmwindow.h"
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index fa93f8878b..8372d7ac6f 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -36,6 +36,7 @@ INCLUDEPATH += $$PWD
 QT += gui-private
 QT += opengl-private
 QT += core-private
+QT += widgets-private
 
 include ($$PWD/gl_integration/gl_integration.pri)
 
-- 
cgit v1.2.3