diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:19:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:33:45 +0200 |
| commit | d7b198605de9979b7875c2da20dea5e4657deb17 (patch) | |
| tree | 7374f5b42572027f09c54e08b32ee3aac0bed4b8 /src/hardwareintegration | |
| parent | e4a4a6dd7503f069efbae81c0587f6d8fe3cee99 (diff) | |
| parent | d5e7965a87d81e2d7157c785403b0aba681de62a (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/client/qwaylandshmbackingstore.cpp
src/client/qwaylandwindow.cpp
Change-Id: I795fd08f0fc5d3cb5ed55bf16e724f66b7567723
Diffstat (limited to 'src/hardwareintegration')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 0dd3e412f..7fe557fbb 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -35,6 +35,7 @@ #define QWAYLANDBRCMEGLINTEGRATION_H #include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h> +#include <wayland-client.h> #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri index 72645ace3..83c7b6212 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri @@ -1,10 +1,9 @@ -PLUGIN_TYPE = waylandcompositors -load(qt_plugin) - QT = compositor compositor-private core-private gui-private INCLUDEPATH += $$PWD +DEFINES += QT_NO_OPENGL_ES_3 + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += wayland-server diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h index 988db84a4..d44a1cd33 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h @@ -64,7 +64,7 @@ public: QSize size() { return m_size; } - static BrcmBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<BrcmBuffer*>(Resource::fromResource(resource)->buffer); } + static BrcmBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<BrcmBuffer*>(Resource::fromResource(resource)->buffer_object); } protected: void buffer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE; |