diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-18 15:40:28 +0200 |
---|---|---|
committer | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-18 16:15:18 +0200 |
commit | 573e9d53f470f9edbc40a21bec86afd39b1c2797 (patch) | |
tree | d7b9e21e82a339a2905a9ad8149764a6b39bd832 | |
parent | 32fdbf184b7478f83e4d6ff4dba3dbe150eb9e9b (diff) | |
download | qtwayland-573e9d53f470f9edbc40a21bec86afd39b1c2797.tar.gz |
Revert "Suppress QWindowSystemInterface inclusion warnings."
This reverts commit c269b748bd1f14207cf600ad5cb75a21a5e824a4.
QWindowSystemInterface is not part of QPA anymore.
Change-Id: I372646bda5b4ea7f1ea2bcf775873b1596c07091
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
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 552dd8d7..37b35fbb 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 <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> #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 4a221ad1..4db506c1 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 <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> #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 12180c41..47fa90e1 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 <qpa/qwindowsysteminterface.h> +#include <QWindowSystemInterface> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp index b9b321e4..c0e011ad 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 <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp index e2b1c3ae..8f47d066 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 <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> QWaylandSurfaceExtension::QWaylandSurfaceExtension(QWaylandDisplay *display, uint32_t id) { diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice.h index 1408263d..8ea73b83 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 <qpa/qwindowsysteminterface.h> +#include <QWindowSystemInterface> #include <wayland-client.h> diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index d9f6ea84..97a259d0 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 <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> #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 cc1633ae..5e8e3010 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 <qpa/qwindowsysteminterface.h> +#include <QWindowSystemInterface> class wl_qtkey_extension; class QWaylandQtKeyExtension diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index 007ff467..14b8f4ea 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 <qpa/qwindowsysteminterface.h> +#include <QWindowSystemInterface> 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 a4ff47d7..226c658a 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 <qpa/qwindowsysteminterface.h> +#include <QWindowSystemInterface> class wl_touch_extension; diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 6e0dd9eb..0d60a6b7 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -58,7 +58,7 @@ #endif #include <QCoreApplication> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/QWindowSystemInterface> #include <QtCore/QDebug> |