From fb595431a95f4848966fb2d0854744d11f593b62 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 11 Aug 2021 18:24:28 +0300 Subject: [PATCH] Link Qt5Svg for wallpaper patterns. --- external/qt/CMakeLists.txt | 2 +- external/qt/package.cmake | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index f54c3e9..53c0320 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -139,6 +139,7 @@ else() lib/${qt_lib_prefix}Qt5Network lib/${qt_lib_prefix}Qt5Widgets lib/${qt_lib_prefix}Qt5Gui + lib/${qt_lib_prefix}Qt5Svg lib/${qt_lib_prefix}qtharfbuzz lib/${qt_lib_prefix}qtlibpng ) @@ -236,7 +237,6 @@ else() lib/${qt_lib_prefix}Qt5ServiceSupport ${common_qt_libs} ${qt_libs_dbus} - lib/${qt_lib_prefix}Qt5Svg lib/${qt_lib_prefix}Qt5Core lib/${qt_lib_prefix}qtpcre2 ) diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 3916ca4..adbc8ed 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -16,7 +16,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) set(Qt5_DIR ${qt_loc}/lib/cmake/Qt5) endif() -find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) +find_package(Qt5 COMPONENTS Core Gui Widgets Network Svg REQUIRED) find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED) if (LINUX) @@ -25,10 +25,6 @@ if (LINUX) find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET) endif() - if (NOT DESKTOP_APP_USE_PACKAGED) - find_package(Qt5 COMPONENTS Svg REQUIRED) - endif() - if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION) find_package(Qt5 OPTIONAL_COMPONENTS DBus QUIET) else()