diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) add_definitions(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff --git a/src/services/kplugininfo.h b/src/services/kplugininfo.h --- a/src/services/kplugininfo.h +++ b/src/services/kplugininfo.h @@ -83,7 +83,8 @@ */ explicit KPluginInfo(const QString &filename /*, QStandardPaths::StandardLocation resource = ...? GenericDataLocation + services ? Is this used? */); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 0) +// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kded still need this for compat reasons +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) /** * Read plugin info from a KService object. * @@ -183,7 +184,8 @@ ~KPluginInfo(); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 0) +// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kded still need this for compat reasons +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) /** * @return A list of KPluginInfo objects constructed from a list of * KService objects. If you get a trader offer of the plugins you want