kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Revert "Get rid of xcb_xlib dependencies"

Browse source 
This reverts commit 6ab5543b3d.

Otherwise HIME input is broken:
https://github.com/telegramdesktop/tdesktop/issues/26228
This commit is contained in:
John Preston 2023-05-24 17:53:23 +04:00
parent cb7a966ad8
commit 32e1044c51
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/qt/CMakeLists.txt vendored
View file

@ -199,6 +199,7 @@ else()
plugins/platforms/${qt_lib_prefix}qxcb plugins/platforms/${qt_lib_prefix}qxcb
plugins/tls/${qt_lib_prefix}qopensslbackend plugins/tls/${qt_lib_prefix}qopensslbackend
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration
plugins/iconengines/${qt_lib_prefix}qsvgicon plugins/iconengines/${qt_lib_prefix}qsvgicon
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}XcbQpa lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}XcbQpa
${common_qt_libs} ${common_qt_libs}
@ -306,6 +307,7 @@ if (LINUX)
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
xcb-cursor xcb-cursor
xcb-glx
xcb-xkb xcb-xkb
xcb-randr xcb-randr
xcb-icccm xcb-icccm
@ -340,6 +342,8 @@ if (LINUX)
EGL EGL
GL GL
xcb xcb
X11
X11-xcb
glib-2.0 glib-2.0
) )
endif() endif()

1
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -32,6 +32,7 @@ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
Q_IMPORT_PLUGIN(QSvgIconPlugin) Q_IMPORT_PLUGIN(QSvgIconPlugin)
#ifdef QT_DBUS_LIB #ifdef QT_DBUS_LIB