diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2021-11-09 14:34:06 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2021-12-07 12:25:13 +0100 |
| commit | f8b59e8c7861a1c91d95410c76bcbfa9f59bf305 (patch) | |
| tree | d85c5c6b278a27b65e93db9104a220a61c58e9f3 /src/configure.cmake | |
| parent | 07ddfbfa43d08c2b76aabafaab38830e04a42690 (diff) | |
| download | qtwayland-f8b59e8c7861a1c91d95410c76bcbfa9f59bf305.tar.gz | |
Remove the XComposite buffer sharing extension
These extensions were disabled because they did not work properly and they
are no longer very useful. It does not make sense to keep
non-functional code around when it is unlikely to be fixed.
[ChangeLog][Extensions][The xcomposite-egl and xcomposite-glx shell
extension protocols have been removed.]
Task-number: QTBUG-97985
Change-Id: I0ad37bd2b35551d7b2b1e5e7d4e77a51037864ad
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/configure.cmake')
| -rw-r--r-- | src/configure.cmake | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/configure.cmake b/src/configure.cmake index ce7fcf59..1c1cf1e8 100644 --- a/src/configure.cmake +++ b/src/configure.cmake @@ -22,9 +22,6 @@ if(LINUX OR QT_FIND_ALL_PACKAGES_ALWAYS) PROVIDED_TARGETS Wayland::Egl MODULE_NAME waylandclient QMAKE_LIB wayland-egl) - qt_find_package(XComposite - PROVIDED_TARGETS PkgConfig::XComposite - MODULE_NAME waylandclient QMAKE_LIB xcomposite) # waylandcompositor libraries qt_find_package(Wayland @@ -35,9 +32,6 @@ if(LINUX OR QT_FIND_ALL_PACKAGES_ALWAYS) PROVIDED_TARGETS Wayland::Egl MODULE_NAME waylandcompositor QMAKE_LIB wayland-egl) - qt_find_package(XComposite - PROVIDED_TARGETS PkgConfig::XComposite - MODULE_NAME waylandcompositor QMAKE_LIB xcomposite) # X11 is not a public dependency of QtGui anymore, so we need to find it manually in a shared build. # In a static build the dependency is still propagated, so check for the target existence to prevent @@ -222,18 +216,6 @@ qt_feature("wayland-vulkan-server-buffer" PRIVATE qt_feature("wayland-datadevice" PRIVATE CONDITION QT_FEATURE_draganddrop OR QT_FEATURE_clipboard ) -qt_feature("xcomposite-egl" PRIVATE - LABEL "XComposite EGL" - 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 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 -) qt_feature("wayland-text-input-v4-wip" PRIVATE LABEL "Qt Wayland TextInput Protocol V4(WIP)" PURPOSE "Enables wayland_text_input_unstable_v4(wip)" @@ -250,6 +232,4 @@ qt_configure_add_summary_entry(ARGS "wayland-libhybris-egl-server-buffer") qt_configure_add_summary_entry(ARGS "wayland-dmabuf-server-buffer") qt_configure_add_summary_entry(ARGS "wayland-shm-emulation-server-buffer") qt_configure_add_summary_entry(ARGS "wayland-vulkan-server-buffer") -qt_configure_add_summary_entry(ARGS "xcomposite-egl") -qt_configure_add_summary_entry(ARGS "xcomposite-glx") qt_configure_end_summary_section() # end of "Qt Wayland Drivers" section |