From b5124ece3e4d36fbaf34cfa84f6141c015580055 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 15 Dec 2020 12:24:53 +0400 Subject: [PATCH] Remove unneeded Qt static plugins --- external/qt/CMakeLists.txt | 12 ------------ external/qt/package.cmake | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index f31a3cd..db226ce 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -26,10 +26,6 @@ if (DESKTOP_APP_USE_PACKAGED) target_link_libraries(external_qt INTERFACE Qt5::DBus) endif() - if (Qt5Svg_FOUND) - target_link_libraries(external_qt INTERFACE Qt5::Svg) - endif() - if (LINUX AND DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) find_library(Qt5ThemeSupport_LIBRARY NAMES @@ -125,7 +121,6 @@ else() if (LINUX) target_include_directories(external_qt SYSTEM INTERFACE - ${qt_loc}/include/QtSvg ${qt_loc}/include/QtThemeSupport ${qt_loc}/include/QtThemeSupport/${qt_version} ${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport @@ -168,7 +163,6 @@ else() target_compile_definitions(external_qt INTERFACE QT_THEME_SUPPORT_LIB - QT_SVG_LIB ) endif() @@ -281,13 +275,8 @@ else() plugins/wayland-decoration-client/${qt_lib_prefix}bradient plugins/wayland-shell-integration/${qt_lib_prefix}ivi-shell plugins/wayland-shell-integration/${qt_lib_prefix}wl-shell - plugins/wayland-shell-integration/${qt_lib_prefix}xdg-shell-v5 - plugins/wayland-shell-integration/${qt_lib_prefix}xdg-shell-v6 plugins/wayland-shell-integration/${qt_lib_prefix}xdg-shell plugins/wayland-graphics-integration-client/${qt_lib_prefix}qt-plugin-wayland-egl - plugins/wayland-graphics-integration-client/${qt_lib_prefix}drm-egl-server - plugins/wayland-graphics-integration-client/${qt_lib_prefix}dmabuf-server - plugins/wayland-graphics-integration-client/${qt_lib_prefix}shm-emulation-server plugins/platforms/${qt_lib_prefix}qwayland-egl plugins/platforms/${qt_lib_prefix}qwayland-generic ) @@ -297,7 +286,6 @@ else() ${qt_libs_dbus_plugins} ${qt_libs_waylandclient_plugins} plugins/platforms/${qt_lib_prefix}qxcb - plugins/imageformats/${qt_lib_prefix}qsvg plugins/iconengines/${qt_lib_prefix}qsvgicon lib/${qt_lib_prefix}Qt5XcbQpa lib/${qt_lib_prefix}Qt5EglSupport diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 3f9f859..fedb6eb 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -29,7 +29,7 @@ if (LINUX) find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET) endif() - if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) + if (NOT DESKTOP_APP_USE_PACKAGED) find_package(Qt5 COMPONENTS Svg REQUIRED) endif()