From 32e1044c5198819dd470e3262275a9747dfd65de Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 24 May 2023 17:53:23 +0400 Subject: [PATCH] Revert "Get rid of xcb_xlib dependencies" This reverts commit 6ab5543b3dd1e40979d258e46d03376931b6c37b. Otherwise HIME input is broken: https://github.com/telegramdesktop/tdesktop/issues/26228 --- external/qt/CMakeLists.txt | 4 ++++ external/qt/qt_static_plugins/qt_static_plugins.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 3d5a48d..4b6829f 100644 --- 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 index 4f8abdd..f6580f4 100644 --- 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