diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-02-04 15:04:56 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-02-04 15:04:56 +0100 |
| commit | e5d1d051e413160e37e7b61d8d7ad74298f98a76 (patch) | |
| tree | 804f966db6780b539ec90206017a1a79c006450b /src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h | |
| parent | 05076e4e16615741becfc434979502901cbf396a (diff) | |
| parent | 50f43a0c56e4329facbba6b7e4bbec0e87ff9d63 (diff) | |
| download | qtwayland-e5d1d051e413160e37e7b61d8d7ad74298f98a76.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.h
src/plugins/hardwareintegration/client/brcm-egl/main.cpp
src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
src/plugins/hardwareintegration/client/wayland-egl/main.cpp
src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
Change-Id: I9a9b418075970dd334babc3590b9b0315c2afb0d
Diffstat (limited to 'src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h')
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h index 88f417f2..9866ad03 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -42,13 +42,13 @@ #ifndef QWAYLANDXCOMPOSITEGLXWINDOW_H #define QWAYLANDXCOMPOSITEGLXWINDOW_H -#include "qwaylandwindow.h" +#include <QtWaylandClient/private/qwaylandwindow_p.h> #include "qwaylandxcompositeglxintegration.h" #include "qwaylandxcompositeglxcontext.h" #include <QtCore/QWaitCondition> -#include "qwaylandbuffer.h" +#include <QtWaylandClient/private/qwaylandbuffer_p.h> QT_BEGIN_NAMESPACE |