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

Use same name for pluginId and library name

Related to https://phabricator.kde.org/T14499
parent 59b075a8
......@@ -136,22 +136,22 @@ endif()
target_link_libraries(kcm_knote_static knotesprivate KF5::AkonadiCore KF5::KCMUtils KF5::NewStuff notesharedprivate KF5::AkonadiNotes KF5::PimCommon KF5::I18n KF5::AkonadiWidgets)
install(FILES
data/knote_config_action.desktop
data/knote_config_display.desktop
data/knote_config_editor.desktop
data/knote_config_network.desktop
data/knote_config_print.desktop
data/knote_config_collection.desktop
data/knote_config_misc.desktop
data/kcm_knote_action.desktop
data/kcm_knote_display.desktop
data/kcm_knote_editor.desktop
data/kcm_knote_network.desktop
data/kcm_knote_print.desktop
data/kcm_knote_collection.desktop
data/kcm_knote_misc.desktop
DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_action.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_display.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_editor.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_network.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_print.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_collection.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/knote_config_misc.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_action.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_display.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_editor.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_network.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_print.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_collection.desktop" SERVICE_TYPES kcmodule.desktop)
kcoreaddons_desktop_to_json(kcm_knote_static "data/kcm_knote_misc.desktop" SERVICE_TYPES kcmodule.desktop)
# Create the individual KCMs
......
......@@ -6,6 +6,6 @@
#include <KPluginFactory>
#include <config/noteactionconfig.h>
K_PLUGIN_FACTORY_WITH_JSON(NoteActionConfigFactory, "knote_config_action.json", registerPlugin<NoteShared::NoteActionConfig>();)
K_PLUGIN_FACTORY_WITH_JSON(NoteActionConfigFactory, "kcm_knote_action.json", registerPlugin<NoteShared::NoteActionConfig>();)
#include "kcm_knote_action.moc"
......@@ -6,6 +6,6 @@
#include "knoteconfigmodule.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KNoteCollectionConfig, "knote_config_collection.json")
K_PLUGIN_CLASS_WITH_JSON(KNoteCollectionConfig, "kcm_knote_collection.json")
#include "kcm_knote_collection.moc"
......@@ -6,6 +6,6 @@
#include "knoteconfigmodule.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KNoteDisplayConfig, "knote_config_display.json")
K_PLUGIN_CLASS_WITH_JSON(KNoteDisplayConfig, "kcm_knote_display.json")
#include "kcm_knote_display.moc"
......@@ -6,6 +6,6 @@
#include "knoteconfigmodule.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KNoteEditorConfig, "knote_config_editor.json")
K_PLUGIN_CLASS_WITH_JSON(KNoteEditorConfig, "kcm_knote_editor.json")
#include "kcm_knote_editor.moc"
......@@ -6,6 +6,6 @@
#include "knoteconfigmodule.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KNoteMiscConfig, "knote_config_misc.json")
K_PLUGIN_CLASS_WITH_JSON(KNoteMiscConfig, "kcm_knote_misc.json")
#include "kcm_knote_misc.moc"
......@@ -6,6 +6,6 @@
#include <KPluginFactory>
#include <config/notenetworkconfig.h>
K_PLUGIN_FACTORY_WITH_JSON(NoteNetworkConfigFactory, "knote_config_network.json", registerPlugin<NoteShared::NoteNetworkConfig>();)
K_PLUGIN_FACTORY_WITH_JSON(NoteNetworkConfigFactory, "kcm_knote_network.json", registerPlugin<NoteShared::NoteNetworkConfig>();)
#include "kcm_knote_network.moc"
......@@ -7,6 +7,6 @@
#include "knoteconfigmodule.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KNotePrintConfig, "knote_config_print.json")
K_PLUGIN_CLASS_WITH_JSON(KNotePrintConfig, "kcm_knote_print.json")
#include "kcm_knote_print.moc"
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