diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 15:10:43 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 16:10:23 +0100 |
| commit | 1c70431808ca2d0797fda05bb9ee3640bff800bb (patch) | |
| tree | 6bbf1333b7da5afea2e163263820d5c40dbc1ea3 /src/compositor/wayland_wrapper/qwldisplay.cpp | |
| parent | 3e02c41cc43a20c8af41730934ae7bbac02ab861 (diff) | |
| parent | c9734e76ce03ebba63e34b60b16a9cca3efa3569 (diff) | |
Merge remote-tracking branch stable into dev
Conflicts:
.qmake.conf
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/plugins/hardwareintegration/compositor/brcm-egl/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
src/plugins/platforms/qwayland-brcm-egl/main.cpp
src/plugins/platforms/qwayland-egl/main.cpp
src/plugins/platforms/qwayland-generic/main.cpp
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
Diffstat (limited to 'src/compositor/wayland_wrapper/qwldisplay.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwldisplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/qwldisplay.cpp b/src/compositor/wayland_wrapper/qwldisplay.cpp index 5dd6e3823..affb0d17a 100644 --- a/src/compositor/wayland_wrapper/qwldisplay.cpp +++ b/src/compositor/wayland_wrapper/qwldisplay.cpp @@ -42,7 +42,7 @@ #include <QtCore/QDebug> -#include <wayland-wayland-server-protocol.h> +#include <QtCompositor/private/wayland-wayland-server-protocol.h> QT_BEGIN_NAMESPACE |