From ce8401e917b381915f17ef6b165b6e7e854293ef Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 29 Mar 2022 00:05:49 +0200 Subject: [PATCH] Don't require KF5::IconThemes for Mobile It just gives us a 48px = Large, so not worth to have that extra dependency for that in my opinion --- CMakeLists.txt | 3 +-- gui/pagepainter.cpp | 3 +-- mobile/components/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43a45c7b9..547671f24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,6 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS ConfigWidgets CoreAddons I18n - IconThemes KIO TextWidgets ThreadWeaver @@ -118,7 +117,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS ) if (BUILD_DESKTOP) - find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash) + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes) endif() if(KF5Wallet_FOUND) diff --git a/gui/pagepainter.cpp b/gui/pagepainter.cpp index 085c2bbf0..fc4613384 100644 --- a/gui/pagepainter.cpp +++ b/gui/pagepainter.cpp @@ -7,7 +7,6 @@ #include "pagepainter.h" // qt / kde includes -#include #include #include #include @@ -33,7 +32,7 @@ #include "settings.h" #include "settings_core.h" -Q_GLOBAL_STATIC_WITH_ARGS(QPixmap, busyPixmap, (QIcon::fromTheme(QLatin1String("okular")).pixmap(KIconLoader::SizeLarge))) +Q_GLOBAL_STATIC_WITH_ARGS(QPixmap, busyPixmap, (QIcon::fromTheme(QLatin1String("okular")).pixmap(48))) #define TEXTANNOTATION_ICONSIZE 24 diff --git a/mobile/components/CMakeLists.txt b/mobile/components/CMakeLists.txt index e4c302812..ad06a2b12 100644 --- a/mobile/components/CMakeLists.txt +++ b/mobile/components/CMakeLists.txt @@ -24,7 +24,6 @@ target_link_libraries(okularplugin Qt5::Xml Qt5::Svg KF5::Bookmarks - KF5::IconThemes KF5::I18n KF5::Service okularcore