diff options
Diffstat (limited to 'src/hardwareintegration/client/wayland-egl')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp index 4b3a635c7..3a34d2561 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp @@ -42,7 +42,7 @@ #include "qwaylandeglwindow.h" #include "qwaylandglcontext.h" -#include <wayland-client.h> +#include <wayland-client-core.h> #include <QtCore/QDebug> #include <private/qeglconvenience_p.h> @@ -65,7 +65,7 @@ static const char *qwaylandegl_threadedgl_blacklist_vendor[] = { QWaylandEglClientBufferIntegration::QWaylandEglClientBufferIntegration() { - qDebug() << "Using Wayland-EGL"; + qCDebug(lcQpaWayland) << "Using Wayland-EGL"; } @@ -87,7 +87,7 @@ void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display) m_eglDisplay = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, display->wl_display(), nullptr); } else { - qWarning("The EGL implementation does not support the Wayland platform"); + qCWarning(lcQpaWayland) << "The EGL implementation does not support the Wayland platform"; return; } } else { @@ -102,13 +102,13 @@ void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display) m_display = display; if (m_eglDisplay == EGL_NO_DISPLAY) { - qWarning("EGL not available"); + qCWarning(lcQpaWayland) << "EGL not available"; return; } EGLint major,minor; if (!eglInitialize(m_eglDisplay, &major, &minor)) { - qWarning("failed to initialize EGL display"); + qCWarning(lcQpaWayland) << "Failed to initialize EGL display" << hex << eglGetError(); m_eglDisplay = EGL_NO_DISPLAY; return; } diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h index 233ce78bd..e9998b832 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h @@ -41,7 +41,7 @@ #define QWAYLANDEGLINCLUDE_H #include <string.h> -#include <wayland-client.h> +#include <wayland-client-core.h> #include <wayland-egl.h> diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 88e893a74..9e6cb876c 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -62,7 +62,7 @@ public: void ensureSize() override; void updateSurface(bool create); - virtual void setGeometry(const QRect &rect) override; + void setGeometry(const QRect &rect) override; QRect contentsRect() const; EGLSurface eglSurface() const; |