Verified Commit 1eb59564 authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

kcm_history: Embed json metadata and install in konqueror_kcms namespace

parent 2a24aab3
...@@ -15,11 +15,8 @@ install(FILES konqsidebar_history.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kon ...@@ -15,11 +15,8 @@ install(FILES konqsidebar_history.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kon
set(kcm_history_SRCS kcmhistory.cpp ../../src/konqhistorysettings.cpp) set(kcm_history_SRCS kcmhistory.cpp ../../src/konqhistorysettings.cpp)
ki18n_wrap_ui(kcm_history_SRCS history_dlg.ui ) 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... # konquerorprivate is only needed for konqhistorysettings...
target_link_libraries(kcm_history konquerorprivate KF5::Konq KF5::Parts ) 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})
...@@ -31,10 +31,7 @@ ...@@ -31,10 +31,7 @@
// Local // Local
K_PLUGIN_FACTORY(KCMHistoryFactory, K_PLUGIN_CLASS_WITH_JSON(HistorySidebarConfig, "kcmhistory.json")
registerPlugin<HistorySidebarConfig>();
)
K_EXPORT_PLUGIN(KCMHistoryFactory("kcmhistory"))
HistorySidebarConfig::HistorySidebarConfig(QWidget *parent, const QVariantList &) HistorySidebarConfig::HistorySidebarConfig(QWidget *parent, const QVariantList &)
: KCModule(parent, QVariantList()) : KCModule(parent, QVariantList())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment