summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-07-03 15:11:25 +0530
committerJørgen Lind <jorgen.lind@nokia.com>2012-07-03 11:44:08 +0200
commitc269b748bd1f14207cf600ad5cb75a21a5e824a4 (patch)
tree41a477d1c18413f8f64124e0fa174f1c02a23ce4
parent41ce17eb1486996d8357d268050a18bc9ac38ad9 (diff)
Suppress QWindowSystemInterface inclusion warnings.
Since QWindowSystemInterface is now part of QPA API. The correct inclusion is: #include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface_p.h> Change-Id: I9f5eafbd67fac3ed144f85c37943e5e1bae5a18e Reviewed-by: Jørgen Lind <jorgen.lind@nokia.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 37b35fbb9..552dd8d78 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 4db506c18..4a221ad14 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 0975d24d6..2c5cb9ea2 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 c0e011adf..b9b321e45 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 8f47d066f..e2b1c3ae7 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 8ea73b833..1408263d6 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 97a259d03..d9f6ea845 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -53,7 +53,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 5e8e30106..cc1633aeb 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 14b8f4eaf..007ff4674 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 226c658ae..a4ff47d74 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 0d60a6b73..6e0dd9eb5 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>