dolphinpart: add JSON metadata to plugin, install into kf5/parts subdir

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1955ce5581275443b0d2c7bf8bec6961d79030a7..e8bb0c95057bc5cbd5bd17af2b8c8a14237df31e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -186,12 +186,13 @@ set(dolphinpart_SRCS
 qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc)
 
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
+kcoreaddons_desktop_to_json(dolphinpart dolphinpart.desktop)
 
 target_link_libraries(dolphinpart
     dolphinprivate
 )
 
-install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
 
 install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 75784b522dbc4a2fb45884b80276cd527f849c17..7aaefa6a018ec3032afb9bd124201cc492c849e4 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -45,7 +45,7 @@
 #include <QStandardPaths>
 #include <QTextDocument>
 
-K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
+K_PLUGIN_CLASS_WITH_JSON(DolphinPart, "dolphinpart.json")
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 0e7efd8e38532591b0f57dcfc110732688fd2f95..079efbe5008c1d10cca32d7bc2337758d97ffa7f 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -51,7 +51,7 @@ Name[zh_CN]=Dolphin 视图
 Name[zh_TW]=Dolphin 檢視
 MimeType=inode/directory;
 X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=dolphinpart
+X-KDE-Library=kf5/parts/dolphinpart
 #X-KDE-BrowserView-Args=Icon
 X-KDE-BrowserView-HideFromMenus=true
 X-KDE-BrowserView-Built-Into=konqueror