diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-29 10:40:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-29 10:40:00 +0100 |
| commit | c87451570f93fd7bf8653c27d6120f6436b9aaae (patch) | |
| tree | e20f34983b526e3159d8898a148db8077e0ef71d /src/hardwareintegration | |
| parent | 80001cbf0451f4ba2a971fb20b80dc8e25ac604d (diff) | |
| parent | 59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I735eb66a8469216029a1225080f49bfdcd3f0732
Diffstat (limited to 'src/hardwareintegration')
| -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; |