diff --git a/applets/systemtray/CMakeLists.txt b/applets/systemtray/CMakeLists.txt index 4b5540b7f..a9325d195 100644 --- a/applets/systemtray/CMakeLists.txt +++ b/applets/systemtray/CMakeLists.txt @@ -20,7 +20,6 @@ target_link_libraries(org.kde.plasma.private.systemtray Qt5::Quick KF5::Plasma Qt5::DBus - KF5::IconThemes KF5::XmlGui KF5::I18n) diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index 6676a75cd..f0474788b 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -46,7 +46,6 @@ target_link_libraries(kdeinit_klipper KF5::CoreAddons KF5::DBusAddons KF5::GlobalAccel - KF5::IconThemes KF5::KIOWidgets KF5::Notifications KF5::Service @@ -80,7 +79,6 @@ target_link_libraries(plasma_engine_clipboard KF5::ConfigGui KF5::CoreAddons # KUrlMimeData KF5::GlobalAccel - KF5::IconThemes KF5::KIOWidgets # PreviewJob KF5::Plasma KF5::Notifications diff --git a/klipper/editactiondialog.cpp b/klipper/editactiondialog.cpp index 3814ade77..66cefcf81 100644 --- a/klipper/editactiondialog.cpp +++ b/klipper/editactiondialog.cpp @@ -20,12 +20,12 @@ #include "editactiondialog.h" +#include #include #include #include "klipper_debug.h" #include -#include #include #include @@ -129,12 +129,7 @@ void ActionDetailModel::setIconForCommand(ClipCommand& cmd) command = command.section( QLatin1Char(' '), 0, 0 ); } - QPixmap iconPix = KIconLoader::global()->loadIcon( - command, KIconLoader::Small, 0, - KIconLoader::DefaultState, - QStringList(), nullptr, true /* canReturnNull */ ); - - if ( !iconPix.isNull() ) { + if (QIcon::hasThemeIcon(command)) { cmd.icon = command; } else { cmd.icon.clear(); diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index 28d8ce0bc..03097f3cf 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -23,6 +23,7 @@ #include "klipper_debug.h" #include #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include -#include #include #include #include @@ -393,11 +393,7 @@ ClipCommand::ClipCommand(const QString&_command, const QString& _description, QString appName = command.section( QLatin1Char(' '), 0, 0 ); if ( !appName.isEmpty() ) { - QPixmap iconPix = KIconLoader::global()->loadIcon( - appName, KIconLoader::Small, 0, - KIconLoader::DefaultState, - QStringList(), nullptr, true /* canReturnNull */ ); - if ( !iconPix.isNull() ) + if (QIcon::hasThemeIcon(appName)) icon = appName; else icon.clear(); diff --git a/logout-greeter/CMakeLists.txt b/logout-greeter/CMakeLists.txt index c7d9067d4..45682e57a 100644 --- a/logout-greeter/CMakeLists.txt +++ b/logout-greeter/CMakeLists.txt @@ -15,7 +15,6 @@ target_link_libraries(ksmserver-logout-greeter Qt5::Quick Qt5::X11Extras KF5::Declarative - KF5::IconThemes KF5::I18n KF5::Package KF5::QuickAddons diff --git a/logout-greeter/shutdowndlg.cpp b/logout-greeter/shutdowndlg.cpp index 171ea803b..9623faf64 100644 --- a/logout-greeter/shutdowndlg.cpp +++ b/logout-greeter/shutdowndlg.cpp @@ -46,7 +46,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include #include #include #include diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index a032c9365..3523cfbc5 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -60,7 +60,6 @@ target_link_libraries(plasmashell KF5::Solid KF5::Declarative KF5::I18n - KF5::IconThemes KF5::Activities KF5::GlobalAccel KF5::CoreAddons