diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:00:44 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:01:08 +0100 |
| commit | 05bf419b206f3cd078364cf67af2df4e4d1477c0 (patch) | |
| tree | c942e884e8f75a29bd9f281c993fbc85a0b832ed /src/plugins/hardwareintegration/compositor/xcomposite-egl | |
| parent | dd5e1ffd3e9e379574325193c8546d453c11303e (diff) | |
| parent | 3698b116a1973146b76319673cdb6787f13f2de6 (diff) | |
Merge branch 'wip-compositor-api' into dev
This introduces the new compositor API, removing the
old API (which was never officially supported).
Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913
Diffstat (limited to 'src/plugins/hardwareintegration/compositor/xcomposite-egl')
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index a8a366732..12d176390 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> +#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "xcompositeeglintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro index 059e462cc..5475f2046 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT += compositor compositor-private core-private gui-private +QT += waylandcompositor waylandcompositor-private core-private gui-private OTHER_FILES += xcomposite-egl.json |