diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-27 08:51:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-29 13:51:58 +0200 |
| commit | 6319bc72e2dc63175ca797ee3042955f852e008f (patch) | |
| tree | c9c1c71c43394a4cd2f0f6a75df8ba6f3a2550f3 /src/hardwareintegration/client | |
| parent | 00c8a79da0c80616f18329cdfc61338a2c1af7df (diff) | |
| parent | 28e7d940c42c47cf039522709883ae3de9f4fb88 (diff) | |
| download | qtwayland-6319bc72e2dc63175ca797ee3042955f852e008f.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/client/xdgoutput/tst_xdgoutput.cpp
Regenerated CMake projects.
Removed duplicate wayland source in
tests/auto/client/xdgoutput/xdgoutput.pro. It's still
referenced via the included shared.pri file. Regenerated
the CMake project to adapt to that. Otherwise the CMake
project fails to configure due to duplicate rules with
a error like the one below
CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command):
Attempt to add a custom rule to output
tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule
Also use a workaround fix for configuring CMake standalone tests
due to regression introduced by
dd7e40b1086020f6a054957f4972720cd684 in qtbase.
Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
Diffstat (limited to 'src/hardwareintegration/client')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp index 9e685b58..b55f3536 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp @@ -125,7 +125,7 @@ void DrmEglServerBufferIntegration::initializeEgl() return; m_egl_initialized = true; -#if defined(EGL_VERSION_1_5) && defined(EGL_PLATFORM_WAYLAND_EXT) +#if QT_CONFIG(egl_extension_platform_wayland) m_egl_display = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, m_display->wl_display(), nullptr); #else m_egl_display = eglGetDisplay((EGLNativeDisplayType) m_display->wl_display()); diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp index 6bd2f76e..4e4ea11f 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp @@ -76,7 +76,7 @@ QWaylandEglClientBufferIntegration::~QWaylandEglClientBufferIntegration() void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display) { -#if defined(EGL_VERSION_1_5) && defined(EGL_PLATFORM_WAYLAND_EXT) +#if QT_CONFIG(egl_extension_platform_wayland) m_eglDisplay = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, display->wl_display(), nullptr); #else if (q_hasEglExtension(EGL_NO_DISPLAY, "EGL_EXT_platform_base")) { diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index e125fc63..ec55bdcd 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -346,7 +346,7 @@ void QWaylandGLContext::updateGLFormat() wl_surface *wlSurface = m_display->createSurface(nullptr); wl_egl_window *eglWindow = wl_egl_window_create(wlSurface, 1, 1); -#if defined(EGL_VERSION_1_5) +#if QT_CONFIG(egl_extension_platform_wayland) EGLSurface eglSurface = eglCreatePlatformWindowSurface(m_eglDisplay, m_config, eglWindow, nullptr); #else EGLSurface eglSurface = eglCreateWindowSurface(m_eglDisplay, m_config, eglWindow, nullptr); |