diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 4.8 5.0 5.63 5.64 + DEPRECATION_VERSIONS 4.8 5.0 5.63 5.64 5.65 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/kiconloader.h b/src/kiconloader.h --- a/src/kiconloader.h +++ b/src/kiconloader.h @@ -686,11 +686,16 @@ KICONTHEMES_EXPORT QIcon MainBarIconSet(const QString &name, int size = 0); #endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 65) /** * \relates KIconLoader * Load a user icon. User icons are searched in $appdir/pics. + * @deprecated since 5.65 Prefer qrc files over user icon themes. + * If that's not an option for now, use KIconLoader::loadIcon. */ +KICONTHEMES_DEPRECATED_VERSION(5, 65, "See API dox for replacement") KICONTHEMES_EXPORT QPixmap UserIcon(const QString &name, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#endif #if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp --- a/src/kiconloader.cpp +++ b/src/kiconloader.cpp @@ -1762,11 +1762,13 @@ } #endif +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 65) QPixmap UserIcon(const QString &name, int state, const QStringList &overlays) { KIconLoader *loader = KIconLoader::global(); return loader->loadIcon(name, KIconLoader::User, 0, state, overlays); } +#endif #if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon UserIconSet(const QString &name)