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

(cherry picked from commit ce8401e917)
remotes/origin/work/aacid/453987
Albert Astals Cid 4 years ago committed by Nicolas Fella
parent 7e248f86be
commit bc9da32708
  1. 3
      CMakeLists.txt
  2. 3
      gui/pagepainter.cpp
  3. 1
      mobile/components/CMakeLists.txt

@ -106,7 +106,6 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
ConfigWidgets ConfigWidgets
CoreAddons CoreAddons
I18n I18n
IconThemes
KIO KIO
TextWidgets TextWidgets
ThreadWeaver ThreadWeaver
@ -118,7 +117,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
) )
if (BUILD_DESKTOP) 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() endif()
if(KF5Wallet_FOUND) if(KF5Wallet_FOUND)

@ -7,7 +7,6 @@
#include "pagepainter.h" #include "pagepainter.h"
// qt / kde includes // qt / kde includes
#include <KIconLoader>
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QDebug>
#include <QIcon> #include <QIcon>
@ -33,7 +32,7 @@
#include "settings.h" #include "settings.h"
#include "settings_core.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 #define TEXTANNOTATION_ICONSIZE 24

@ -24,7 +24,6 @@ target_link_libraries(okularplugin
Qt5::Xml Qt5::Xml
Qt5::Svg Qt5::Svg
KF5::Bookmarks KF5::Bookmarks
KF5::IconThemes
KF5::I18n KF5::I18n
KF5::Service KF5::Service
okularcore okularcore

Loading…
Cancel
Save