Fixing include warnings regarding QWindowSystemInterface

Change-Id: Ie8df028fed311e8938ed8d25552e11dc8ff9261a
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

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 68cbb4f..82d66bb 100644 (file)
--- 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 21badb2..e8599e4 100644 (file)
--- 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 fcf1c13..57eae5a 100644 (file)
--- 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 1af1fa4..3171e7e 100644 (file)
--- 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 1d3bd6d..be95ec9 100644 (file)
--- 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 5fe7203..71bb038 100644 (file)
--- 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 f3775e9..1edf37e 100644 (file)
--- 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 fca1b37..8f6dbd2 100644 (file)
--- 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 d5ac815..a20af35 100644 (file)
--- 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 2148b9b..919bfe8 100644 (file)
--- 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 7fae0a4..73fef4c 100644 (file)
--- 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>