diff options
author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-05-08 00:18:48 -0700 |
---|---|---|
committer | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-05-08 12:00:09 +0200 |
commit | 203a50b8aa57413f5de128fcb1124959e7977a9f (patch) | |
tree | 687a82def67f28b1fb9fee3eda1e34c8a1d0d8a6 /src/compositor/wayland_wrapper | |
parent | c7ec341ff6c56026253f48226e42a98b96c03793 (diff) |
Adapt to _qpa file rename in qtbase.
qtbase change 36547f4eff44361f7a6acd0cff107c0e47561f93
renamed qpa headers.
Change-Id: I39b0f636bd69cfe1b4e0f4e1d2419148d83433ca
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index 1e60d95bd..f8aaaf736 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -58,9 +58,9 @@ #include <QWindow> #include <QSocketNotifier> #include <QScreen> -#include <QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <QGuiApplication> -#include <QPlatformScreenPageFlipper> +#include <qpa/qplatformscreenpageflipper.h> #include <QDebug> #include <stdio.h> diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp index 301368117..68e58fb14 100644 --- a/src/compositor/wayland_wrapper/wlsurface.cpp +++ b/src/compositor/wayland_wrapper/wlsurface.cpp @@ -58,7 +58,7 @@ #ifdef QT_COMPOSITOR_WAYLAND_GL #include "hardware_integration/graphicshardwareintegration.h" -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #endif #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT diff --git a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp index 43b741fa2..efd504011 100644 --- a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp @@ -45,7 +45,7 @@ #ifdef QT_COMPOSITOR_WAYLAND_GL #include "hardware_integration/graphicshardwareintegration.h" -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #endif #include <QtCore/QDebug> diff --git a/src/compositor/wayland_wrapper/wlsurfacebuffer.h b/src/compositor/wayland_wrapper/wlsurfacebuffer.h index fd01affe5..cbf66ae21 100644 --- a/src/compositor/wayland_wrapper/wlsurfacebuffer.h +++ b/src/compositor/wayland_wrapper/wlsurfacebuffer.h @@ -43,7 +43,7 @@ #include <QtCore/QRect> #include <QtGui/qopengl.h> -#include <QtGui/QPlatformScreenBuffer> +#include <qpa/qplatformscreenpageflipper.h> #include <wayland-server.h> |