Revert "Get rid of xcb_xlib dependencies"

This reverts commit 6ab5543. Otherwise HIME input is broken: telegramdesktop/tdesktop#26228
desktop-app · May 24, 2023 · 32e1044 · 32e1044
1 parent cb7a966
commit 32e1044
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
@@ -199,6 +199,7 @@ else()
         plugins/platforms/${qt_lib_prefix}qxcb
         plugins/tls/${qt_lib_prefix}qopensslbackend
         plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration
+        plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration
         plugins/iconengines/${qt_lib_prefix}qsvgicon
         lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}XcbQpa
         ${common_qt_libs}
@@ -306,6 +307,7 @@ if (LINUX)
         xkbcommon
         xkbcommon-x11
         xcb-cursor
+        xcb-glx
         xcb-xkb
         xcb-randr
         xcb-icccm
@@ -340,6 +342,8 @@ if (LINUX)
         EGL
         GL
         xcb
+        X11
+        X11-xcb
         glib-2.0
     )
 endif()
diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp
@@ -32,6 +32,7 @@ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
 #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
 Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin)
+Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
 Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QSvgIconPlugin)
 #ifdef QT_DBUS_LIB