diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index aa5a3a8..b93b456 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -82,10 +82,6 @@ if (DESKTOP_APP_USE_PACKAGED) ) endif() endif() - - if (Qt5X11Extras_FOUND) - target_link_libraries(external_qt INTERFACE Qt5::X11Extras) - endif() else() target_include_directories(external_qt SYSTEM INTERFACE @@ -121,7 +117,6 @@ else() ${qt_loc}/include/QtSvg ${qt_loc}/include/QtThemeSupport ${qt_loc}/include/QtWaylandClient - ${qt_loc}/include/QtX11Extras ${qt_loc}/include/QtThemeSupport/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport @@ -160,7 +155,6 @@ else() QT_WAYLANDCLIENT_LIB QT_THEME_SUPPORT_LIB QT_SVG_LIB - QT_X11EXTRAS_LIB ) endif() @@ -285,7 +279,6 @@ else() ${qt_libs_dbus_support} plugins/bearer/${qt_lib_prefix}qgenericbearer ${qt_libs_dbus_bearers} - lib/${qt_lib_prefix}Qt5X11Extras lib/${qt_lib_prefix}Qt5WaylandClient ${common_qt_libs} ${qt_libs_dbus} diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 4f8ba39..d7697ec 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -27,14 +27,8 @@ if (LINUX) find_package(Qt5 COMPONENTS WaylandClient REQUIRED) find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET) - if (NOT DESKTOP_APP_USE_PACKAGED) - find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED) - elseif (DESKTOP_APP_USE_PACKAGED_LAZY) - find_package(Qt5 COMPONENTS X11Extras REQUIRED) - - if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - find_package(Qt5 COMPONENTS Svg REQUIRED) - endif() + if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) + find_package(Qt5 COMPONENTS Svg REQUIRED) endif() if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)