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 + DEPRECATION_VERSIONS 4.8 5.0 5.63 5.64 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/kicontheme.h b/src/kicontheme.h --- a/src/kicontheme.h +++ b/src/kicontheme.h @@ -267,23 +267,29 @@ */ static QString defaultThemeName(); +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 64) /** * Defines the context menus that assignIconsToContextMenus is * aware of. * * For ReadOnlyText the menu is expected to have one entry. * * TextEditor is expected to have the full complement of * undo, redo, cut, copy, paste and clear. + * + * @deprecated since 5.64 no longer needed */ enum ContextMenus { TextEditor, ReadOnlyText - }; + }; // TODO KF6 remove /** * Assigns standard icons to the various standard text edit context menus. + * + * @deprecated since 5.64, no longer necessary, Qt assigns icon itself by now. */ - static void assignIconsToContextMenu(ContextMenus type, QList actions); + KICONTHEMES_DEPRECATED_VERSION(5, 64, "No longer necessary") static void assignIconsToContextMenu(ContextMenus type, QList actions); // TODO KF6 remove +#endif private: class KIconThemePrivate;