From 220835876580f1df072c469e6c4dd746131a2293 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 24 Dec 2020 05:44:32 +0400 Subject: [PATCH] Link libraries needed for GL on XCB --- external/qt/CMakeLists.txt | 4 ++++ external/qt/qt_static_plugins/qt_static_plugins.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 9ebb64d..40b25b0 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -280,9 +280,12 @@ else() ${qt_libs_dbus_plugins} ${qt_libs_waylandclient_plugins} plugins/platforms/${qt_lib_prefix}qxcb + 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}Qt5XcbQpa lib/${qt_lib_prefix}Qt5EglSupport + lib/${qt_lib_prefix}Qt5GlxSupport lib/${qt_lib_prefix}Qt5ServiceSupport lib/${qt_lib_prefix}Qt5EdidSupport lib/${qt_lib_prefix}Qt5XkbCommonSupport @@ -349,6 +352,7 @@ else() wayland-client xkbcommon xkbcommon-x11 + xcb-glx xcb-xkb xcb-randr xcb-icccm diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index 349651e..587a66a 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -22,6 +22,8 @@ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) #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(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QSvgIconPlugin)