summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Senyk <thomas.senyk@pelagicore.com>2012-10-16 19:41:54 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2012-10-16 20:12:42 +0200
commit378d410d4cad639892048d8867821e04c972e975 (patch)
treeb092b3df696d1f46b9877ff2d0b01af77ccb86cc
parent939964974d1eff70657e97cd5131dbd50e7b12ff (diff)
Fixing include warnings regarding QWindowSystemInterface
Change-Id: Ie8df028fed311e8938ed8d25552e11dc8ff9261a Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
-rw-r--r--src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandextendedoutput.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandextendedsurface.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandinputdevice.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylandintegration.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandqtkey.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylandscreen.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandtouch.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp
index 68cbb4f1d..82d66bb12 100644
--- a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp
@@ -48,7 +48,7 @@
#include <QtPlatformSupport/private/qeglconvenience_p.h>
#include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
#include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
index 21badb2fb..e8599e41e 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
@@ -47,7 +47,7 @@
#include <QtPlatformSupport/private/qeglconvenience_p.h>
#include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
#include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
index fcf1c13ad..57eae5a77 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
@@ -54,7 +54,7 @@
#include <qpa/qplatformclipboard.h>
#include <QtGui/QPainter>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QDebug>
diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp
index 1af1fa44f..3171e7ec1 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp
+++ b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp
@@ -45,7 +45,7 @@
#include "wayland-output-extension-client-protocol.h"
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QDebug>
diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
index 1d3bd6d53..be95ec98b 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
@@ -52,7 +52,7 @@
#include <QtGui/QGuiApplication>
#include <qpa/qplatformnativeinterface.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
QWaylandSurfaceExtension::QWaylandSurfaceExtension(QWaylandDisplay *display, uint32_t id)
{
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice.h
index 5fe720320..71bb0385a 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.h
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.h
@@ -48,7 +48,7 @@
#include <QObject>
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformscreen.h>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#include <wayland-client.h>
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index f3775e95e..1edf37e97 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -54,7 +54,7 @@
#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformcursor.h>
#include <QtGui/QSurfaceFormat>
#include <QtGui/QOpenGLContext>
diff --git a/src/plugins/platforms/wayland/qwaylandqtkey.h b/src/plugins/platforms/wayland/qwaylandqtkey.h
index fca1b372d..8f6dbd298 100644
--- a/src/plugins/platforms/wayland/qwaylandqtkey.h
+++ b/src/plugins/platforms/wayland/qwaylandqtkey.h
@@ -43,7 +43,7 @@
#define QWAYLANDQTKEY_H
#include "qwaylanddisplay.h"
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
class wl_qtkey_extension;
class QWaylandQtKeyExtension
diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp
index d5ac81532..a20af3539 100644
--- a/src/plugins/platforms/wayland/qwaylandscreen.cpp
+++ b/src/plugins/platforms/wayland/qwaylandscreen.cpp
@@ -45,7 +45,7 @@
#include "qwaylandcursor.h"
#include "qwaylandextendedoutput.h"
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, struct wl_output *output, QRect geometry)
: QPlatformScreen()
diff --git a/src/plugins/platforms/wayland/qwaylandtouch.h b/src/plugins/platforms/wayland/qwaylandtouch.h
index 2148b9b83..919bfe878 100644
--- a/src/plugins/platforms/wayland/qwaylandtouch.h
+++ b/src/plugins/platforms/wayland/qwaylandtouch.h
@@ -43,7 +43,7 @@
#define QWAYLANDTOUCH_H
#include "qwaylanddisplay.h"
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
class wl_touch_extension;
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 7fae0a44b..73fef4c70 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -58,7 +58,7 @@
#endif
#include <QCoreApplication>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QDebug>