diff options
| author | Georg Leugner <gleugner@luxoft.com> | 2019-03-20 11:22:56 +0100 |
|---|---|---|
| committer | Georg Leugner <gleugner@luxoft.com> | 2019-03-22 13:54:41 +0000 |
| commit | c16810c2169affe390d1d403d2e2caa8730fc80f (patch) | |
| tree | 5a6803356b3e4f0c360842a63b06a5918cc1eca0 | |
| parent | c0905957be0d7db90c9d9f05069a259575753dfe (diff) | |
BRCM: fix namespace confusion
Change-Id: I146dd41d54889af694b829bf1e6d47e03e892b27
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| -rw-r--r-- | src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp | 2 | ||||
| -rw-r--r-- | src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp index cd0f285cd..59dc76825 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp @@ -57,7 +57,7 @@ QWaylandBrcmEglIntegration::QWaylandBrcmEglIntegration() qDebug() << "Using Brcm-EGL"; } -void QWaylandBrcmEglIntegration::wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version) +void QWaylandBrcmEglIntegration::wlDisplayHandleGlobal(void *data, struct ::wl_registry *registry, uint32_t id, const QString &interface, uint32_t version) { Q_UNUSED(version); if (interface == "qt_brcm") { diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 420f8d20f..f65a88b1b 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -41,6 +41,7 @@ #define QWAYLANDBRCMEGLINTEGRATION_H #include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h> +#include <QtWaylandClient/private/wayland-wayland-client-protocol.h> #include <wayland-client-core.h> #include <EGL/egl.h> @@ -86,7 +87,7 @@ public: void *nativeResourceForContext(NativeResource resource, QPlatformOpenGLContext *context) override; private: - static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); + static void wlDisplayHandleGlobal(void *data, struct ::wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); struct wl_display *m_waylandDisplay = nullptr; struct qt_brcm *m_waylandBrcm = nullptr; |