diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,6 @@ find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ItemViews ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/src/libkdepim/CMakeLists.txt b/src/libkdepim/CMakeLists.txt --- a/src/libkdepim/CMakeLists.txt +++ b/src/libkdepim/CMakeLists.txt @@ -92,7 +92,6 @@ KF5::I18n KF5::KCMUtils KF5::Wallet - KF5::IconThemes KF5::KIOCore KF5::KIOWidgets ) @@ -250,7 +249,7 @@ add_library(kcm_ldap MODULE ${kcm_ldap_SRCS}) -target_link_libraries(kcm_ldap KF5::Libkdepim KF5::IconThemes KF5::KCMUtils KF5::I18n KF5::Ldap Qt5::Core) +target_link_libraries(kcm_ldap KF5::Libkdepim KF5::KCMUtils KF5::I18n KF5::Ldap Qt5::Core) kcoreaddons_desktop_to_json(kcm_ldap ldap/kcmldap.desktop DEFAULT_SERVICE_TYPE) diff --git a/src/libkdepim/ldap/ldapconfigurewidget.cpp b/src/libkdepim/ldap/ldapconfigurewidget.cpp --- a/src/libkdepim/ldap/ldapconfigurewidget.cpp +++ b/src/libkdepim/ldap/ldapconfigurewidget.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -324,13 +323,11 @@ mUpButton = new QToolButton(upDownBox); upDownBoxVBoxLayout->addWidget(mUpButton); mUpButton->setIcon(QIcon::fromTheme(QStringLiteral("go-up"))); - mUpButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall)); mUpButton->setEnabled(false); // b/c no item is selected yet mDownButton = new QToolButton(upDownBox); upDownBoxVBoxLayout->addWidget(mDownButton); mDownButton->setIcon(QIcon::fromTheme(QStringLiteral("go-down"))); - mDownButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall)); mDownButton->setEnabled(false); // b/c no item is selected yet QWidget *spacer = new QWidget(upDownBox); diff --git a/src/libkdepim/progresswidget/ssllabel.cpp b/src/libkdepim/progresswidget/ssllabel.cpp --- a/src/libkdepim/progresswidget/ssllabel.cpp +++ b/src/libkdepim/progresswidget/ssllabel.cpp @@ -33,10 +33,10 @@ #include "ssllabel.h" #include -#include #include #include +#include using namespace KPIM; @@ -61,12 +61,12 @@ switch (state) { case Encrypted: setToolTip(i18n("Connection is encrypted")); - setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(IconSize(KIconLoader::Small))); + setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize))); show(); break; case Unencrypted: setToolTip(i18n("Connection is unencrypted")); - setPixmap(QIcon::fromTheme(QStringLiteral("security-low")).pixmap(IconSize(KIconLoader::Small))); + setPixmap(QIcon::fromTheme(QStringLiteral("security-low")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize))); show(); break; case Unknown: