diff options
| -rw-r--r-- | docs/Doxyfile.local | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/core/kemailsettings.h | 12 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/kstandardshortcut.h | 3 |
5 files changed, 22 insertions, 9 deletions
diff --git a/docs/Doxyfile.local b/docs/Doxyfile.local index 6fff4f58..37895c76 100644 --- a/docs/Doxyfile.local +++ b/docs/Doxyfile.local @@ -5,6 +5,12 @@ PREDEFINED += \ "KCONFIGCORE_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGCORE_BUILD_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGCORE_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGCORE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ "KCONFIGGUI_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGGUI_BUILD_DEPRECATED_SINCE(x, y)=1" \ - "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)=" + "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGGUI_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 151c3249..e6bac82a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,10 +37,16 @@ if (BUILD_QCH) KCONFIGCORE_DEPRECATED_EXPORT KCONFIGCORE_DEPRECATED "KCONFIGCORE_DEPRECATED_VERSION(x, y, t)" + "KCONFIGCORE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION(x, y, t)" + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" KCONFIGGUI_EXPORT KCONFIGGUI_DEPRECATED_EXPORT KCONFIGGUI_DEPRECATED "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)" + "KCONFIGGUI_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION(x, y, t)" + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff --git a/src/core/kemailsettings.h b/src/core/kemailsettings.h index eb701f8c..7ced45aa 100644 --- a/src/core/kemailsettings.h +++ b/src/core/kemailsettings.h @@ -52,15 +52,15 @@ public: /** * @deprecated since 5.0 */ - OutServerType, + OutServerType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - OutServerCommand, + OutServerCommand KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - OutServerTLS, + OutServerTLS KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), #else OutServerType_DEPRECATED_DO_NOT_USE, OutServerCommand_DEPRECATED_DO_NOT_USE, @@ -73,15 +73,15 @@ public: /** * @deprecated since 5.0 */ - InServerType, + InServerType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - InServerMBXType, + InServerMBXType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - InServerTLS + InServerTLS KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users") #endif }; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2de87570..b6d4d34f 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -15,7 +15,7 @@ ecm_generate_export_header(KF5ConfigGui GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.11 5.39 5.71 + DEPRECATION_VERSIONS 5.11 5.39 5.71 5.82 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h index 9dad7ffb..305cf8ed 100644 --- a/src/gui/kstandardshortcut.h +++ b/src/gui/kstandardshortcut.h @@ -123,7 +123,8 @@ enum StandardShortcut { ShowToolbar, ///< Show/Hide the toolbar. ShowStatusbar, ///< Show/Hide the statusbar. #if KCONFIGGUI_ENABLE_DEPRECATED_SINCE(5, 39) - SaveOptions, ///< @deprecated since 5.39 + SaveOptions ///< @deprecated since 5.39 + KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 39, "No known users"), #else SaveOptions_DEPRECATED_DO_NOT_USE, #endif |