diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ set(QT_REQUIRED_VERSION "5.12.0") -set(KONTACTINTERFACE_LIB_VERSION "5.14.41") +set(KONTACTINTERFACE_LIB_VERSION "5.14.42") set(KPIMTEXTEDIT_LIB_VERSION "5.14.40") set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.14.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40") diff --git a/kontactplugin/CMakeLists.txt b/kontactplugin/CMakeLists.txt --- a/kontactplugin/CMakeLists.txt +++ b/kontactplugin/CMakeLists.txt @@ -13,9 +13,11 @@ target_link_libraries(kontact_akregatorplugin KF5::KontactInterface) +kcoreaddons_desktop_to_json(kontact_akregatorplugin akregatorplugin.desktop) + ########### install files ############### -install(TARGETS kontact_akregatorplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS kontact_akregatorplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5) install(FILES akregatorplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact) diff --git a/kontactplugin/akregator_plugin.cpp b/kontactplugin/akregator_plugin.cpp --- a/kontactplugin/akregator_plugin.cpp +++ b/kontactplugin/akregator_plugin.cpp @@ -35,7 +35,7 @@ #include #include -EXPORT_KONTACT_PLUGIN(AkregatorPlugin, akregator) +EXPORT_KONTACT_PLUGIN_WITH_JSON(AkregatorPlugin, akregator, "akregatorplugin.json") AkregatorPlugin::AkregatorPlugin(KontactInterface::Core *core, const QVariantList &) : KontactInterface::Plugin(core, core, "akregator") diff --git a/kontactplugin/akregatorplugin.desktop b/kontactplugin/akregatorplugin.desktop --- a/kontactplugin/akregatorplugin.desktop +++ b/kontactplugin/akregatorplugin.desktop @@ -3,7 +3,7 @@ Icon=view-pim-news X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo -X-KDE-Library=kontact_akregatorplugin +X-KDE-Library=kontact5/kontact_akregatorplugin X-KDE-KontactPluginVersion=10 X-KDE-KontactPartLibraryName=akregatorpart X-KDE-KontactPartExecutableName=akregator