kcm_history: Embed json metadata and install in konqueror_kcms namespace

sidebar/history_module/CMakeLists.txt

@@ -15,11 +15,8 @@ install(FILES konqsidebar_history.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kon
 
 set(kcm_history_SRCS kcmhistory.cpp ../../src/konqhistorysettings.cpp)
 ki18n_wrap_ui(kcm_history_SRCS history_dlg.ui )
-add_library(kcm_history MODULE ${kcm_history_SRCS})
+kcoreaddons_add_plugin(kcm_history SOURCES ${kcm_history_SRCS} INSTALL_NAMESPACE konqueror_kcms)
+kcoreaddons_desktop_to_json(kcm_history kcmhistory.desktop)
 
 # konquerorprivate is only needed for konqhistorysettings...
-target_link_libraries(kcm_history konquerorprivate KF5::Konq KF5::Parts  )
-
-install(TARGETS kcm_history DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-install(FILES kcmhistory.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-
+target_link_libraries(kcm_history konquerorprivate KF5::Konq KF5::Parts)

sidebar/history_module/kcmhistory.cpp

@@ -31,10 +31,7 @@
 
 // Local
 
-K_PLUGIN_FACTORY(KCMHistoryFactory,
-                 registerPlugin<HistorySidebarConfig>();
-                )
-K_EXPORT_PLUGIN(KCMHistoryFactory("kcmhistory"))
+K_PLUGIN_CLASS_WITH_JSON(HistorySidebarConfig, "kcmhistory.json")
 
 HistorySidebarConfig::HistorySidebarConfig(QWidget *parent, const QVariantList &)
     : KCModule(parent, QVariantList())