From ed048edb23a0098ccf0c66a28451c5a6e2f0ced1 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 24 May 2022 18:27:48 +0200 Subject: [PATCH] Qt6: fix Qt5 builds [3] --- src/CMakeLists.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e3ed1697..651b9633 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -252,7 +252,6 @@ target_link_libraries(feather Qt::Gui Qt::Network Qt::Svg - Qt::SvgWidgets Qt::Xml Qt::WebSockets ${ICU_LIBRARIES} @@ -266,6 +265,10 @@ target_link_libraries(feather SingleApplication::SingleApplication ) +if(Qt6_FOUND) + target_link_libraries(feather Qt::SvgWidgets) +endif() + if(DEVICE_TREZOR_READY) target_link_libraries(feather ${TREZOR_DEP_LIBS}) endif() @@ -279,20 +282,20 @@ endif() if(NOT APPLE AND NOT Qt6_FOUND) target_link_libraries(feather - Qt::QSvgIconPlugin - Qt::QSvgPlugin + Qt5::QSvgIconPlugin + Qt5::QSvgPlugin ) endif() -if(STATIC) +if(STATIC AND NOT Qt6_FOUND) if(NOT Qt6_FOUND) target_link_libraries(feather - Qt::QSvgIconPlugin - Qt::QSvgPlugin) + Qt5::QSvgIconPlugin + Qt5::QSvgPlugin) endif() if(UNIX AND NOT APPLE) target_link_libraries(feather - Qt::QXcbIntegrationPlugin) + Qt5::QXcbIntegrationPlugin) endif() endif() -- 2.52.0