From bc6f4467386afd71a48d0e9273c98f2a3c06e0db Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 9 Nov 2021 13:36:30 +0100 Subject: [PATCH] Don't build XComposite buffer integration by default Both xcomposite-egl and xcomposite-glx have rendering issues, and they do not work with the latest Nvidia driver versions. These plugins were created to allow testing/debugging of QtWayland-based compositors on desktops that did not support Wayland natively. At this time, Wayland is much more widely supported on the desktop, and [ChangeLog][Extensions][The xcomposite-egl and xcomposite-glx shell extension protocols are no longer built by default.] Task-number: QTBUG-92074 Task-number: QTBUG-97985 Pick-to: 6.2 Change-Id: Ifded68b92e91e2d98aa44b8cfc624a4072b30451 Reviewed-by: Liang Qi Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Aleix Pol Gonzalez --- src/platformsupport/wayland/configure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/wayland/configure.cmake b/src/platformsupport/wayland/configure.cmake index 6939fbe9495..aaa426e194b 100644 --- a/src/platformsupport/wayland/configure.cmake +++ b/src/platformsupport/wayland/configure.cmake @@ -223,13 +223,13 @@ qt_feature("wayland-datadevice" PRIVATE ) qt_feature("xcomposite-egl" PRIVATE LABEL "XComposite EGL" - CONDITION (QT_FEATURE_wayland_client OR QT_FEATURE_wayland_server) + CONDITION FALSE AND (QT_FEATURE_wayland_client OR QT_FEATURE_wayland_server) AND QT_FEATURE_opengl AND QT_FEATURE_egl AND QT_FEATURE_xlib AND XComposite_FOUND AND QT_FEATURE_egl_x11 ) qt_feature("xcomposite-glx" PRIVATE LABEL "XComposite GLX" - CONDITION (QT_FEATURE_wayland_client OR QT_FEATURE_wayland_server) + CONDITION FALSE AND (QT_FEATURE_wayland_client OR QT_FEATURE_wayland_server) AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 AND QT_FEATURE_xlib AND XComposite_FOUND )