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/hardware_integration | |
| 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/hardware_integration')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp index 8de4d086a..293cf2575 100644 --- a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp +++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp @@ -42,10 +42,10 @@ #include "wayland_wrapper/wlcompositor.h" #include "wayland_wrapper/wlsurface.h" #include "compositor_api/waylandsurface.h" -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <QtGui/QGuiApplication> #include <QtGui/QOpenGLContext> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <QtGui/QWindow> #include <QtCore/QWeakPointer> diff --git a/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp index 88f5a1ce1..cb66b6072 100644 --- a/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp +++ b/src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp @@ -45,8 +45,8 @@ #include "wayland-xcomposite-server-protocol.h" #include <QtGui/QGuiApplication> -#include <QtGui/QPlatformNativeInterface> -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformopenglcontext.h> #include "xcompositebuffer.h" #include "xcompositehandler.h" diff --git a/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp index b8a860835..38dba7cb0 100644 --- a/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp +++ b/src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp @@ -44,8 +44,8 @@ #include "wayland_wrapper/wlcompositor.h" #include "wayland-xcomposite-server-protocol.h" -#include <QtGui/QPlatformNativeInterface> -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformintegration.h> #include <QtGui/QOpenGLContext> #include "xcompositebuffer.h" |