Commit 97d0434c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Move plugins in subdirectory

parent dbfe7482
......@@ -76,7 +76,7 @@ set(LIBKLEO_LIB_VERSION "5.13.40")
set(AKONADI_LIB_VERSION "5.13.40")
set(INCIDENCEEDITOR_LIB_VERSION "5.13.40")
set(KTNEF_LIB_VERSION "5.13.40")
set(MESSAGELIB_LIB_VERSION "5.13.52")
set(MESSAGELIB_LIB_VERSION "5.13.55")
set(AKONADICALENDAR_LIB_VERSION "5.13.40")
set(CALENDAR_UTILS_VERSION "5.13.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.13.40")
......
......@@ -10,7 +10,7 @@ set(kaddressbook_importexport_csv_SRCS
kcoreaddons_add_plugin(kaddressbook_importexportcsvplugin JSON kaddressbook_importexportcsvplugin.json SOURCES
${kaddressbook_importexport_csv_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_importexport_csv_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportcsvplugin KF5::KaddressbookImportExport
KF5::PimCommon
......
......@@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kaddressbook_importexport_gmx_SRCS HEADER kaddre
kcoreaddons_add_plugin(kaddressbook_importexportgmxplugin JSON kaddressbook_importexportgmxplugin.json SOURCES
${kaddressbook_importexport_gmx_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_importexport_gmx_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportgmxplugin KF5::KaddressbookImportExport
KF5::PimCommon
......
......@@ -5,7 +5,7 @@ set(kaddressbook_importexport_ldap_SRCS
kcoreaddons_add_plugin(kaddressbook_importexportldapplugin JSON kaddressbook_importexportldapplugin.json SOURCES
${kaddressbook_importexport_ldap_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_importexport_ldap_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportldapplugin KF5::KaddressbookImportExport
KF5::PimCommon
......
......@@ -5,7 +5,7 @@ set(kaddressbook_importexport_ldif_SRCS
kcoreaddons_add_plugin(kaddressbook_importexportldifplugin JSON kaddressbook_importexportldifplugin.json SOURCES
${kaddressbook_importexport_ldif_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_importexport_ldif_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportldifplugin KF5::KaddressbookImportExport
KF5::PimCommon
......
......@@ -7,7 +7,7 @@ set(kaddressbook_importexport_vcard_SRCS
kcoreaddons_add_plugin(kaddressbook_importexportvcardplugin JSON kaddressbook_importexportvcardplugin.json SOURCES
${kaddressbook_importexport_vcard_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_importexport_vcard_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportvcardplugin
KF5::KaddressbookImportExport
......
......@@ -17,7 +17,7 @@ set(kaddressbook_checkgravatarplugin_SRCS
ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME org.kde.pim.kaddressbook_checkgravatar)
kcoreaddons_add_plugin(kaddressbook_checkgravatarplugin JSON kaddressbook_checkgravatarplugin.json SOURCES
${kaddressbook_checkgravatarplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_checkgravatarplugin_SRCS} INSTALL_NAMESPACE kaddressbook/mainview)
target_link_libraries(kaddressbook_checkgravatarplugin
KF5::PimCommon KF5::Completion KF5::PimCommonAkonadi KF5::XmlGui KF5::Gravatar KF5::I18n KF5::Contacts
......
......@@ -5,7 +5,7 @@ set(kaddressbook_mergecontactsplugin_SRCS
kcoreaddons_add_plugin(kaddressbook_mergecontactsplugin JSON kaddressbook_mergecontactsplugin.json SOURCES
${kaddressbook_mergecontactsplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_mergecontactsplugin_SRCS} INSTALL_NAMESPACE kaddressbook/mainview)
target_link_libraries(kaddressbook_mergecontactsplugin
KF5::PimCommon KF5::Completion KF5::PimCommonAkonadi KF5::XmlGui kaddressbookmergelibprivate KF5::I18n
......
......@@ -4,7 +4,7 @@ set(kaddressbook_searchduplicatesplugin_SRCS
)
kcoreaddons_add_plugin(kaddressbook_searchduplicatesplugin JSON kaddressbook_searchduplicatesplugin.json SOURCES
${kaddressbook_searchduplicatesplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_searchduplicatesplugin_SRCS} INSTALL_NAMESPACE kaddressbook/mainview)
target_link_libraries(kaddressbook_searchduplicatesplugin
KF5::PimCommon KF5::Completion KF5::PimCommonAkonadi KF5::XmlGui kaddressbookmergelibprivate KF5::I18n
......
......@@ -12,7 +12,7 @@ set(kaddressbook_sendmailplugin_SRCS
ecm_qt_declare_logging_category(kaddressbook_sendmailplugin_SRCS HEADER kaddressbook_sendmailplugin_debug.h IDENTIFIER KADDRESSBOOK_SENDMAIL_LOG CATEGORY_NAME org.kde.pim.kaddressbook_sendmail)
kcoreaddons_add_plugin(kaddressbook_sendmailplugin JSON kaddressbook_sendmailplugin.json SOURCES
${kaddressbook_sendmailplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_sendmailplugin_SRCS} INSTALL_NAMESPACE kaddressbook/mainview)
target_link_libraries(kaddressbook_sendmailplugin
......
......@@ -11,7 +11,7 @@ ecm_qt_declare_logging_category(kaddressbook_sendvcardsplugin_SRCS HEADER kaddre
kcoreaddons_add_plugin(kaddressbook_sendvcardsplugin JSON kaddressbook_sendvcardsplugin.json SOURCES
${kaddressbook_sendvcardsplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
${kaddressbook_sendvcardsplugin_SRCS} INSTALL_NAMESPACE kaddressbook/mainview)
target_link_libraries(kaddressbook_sendvcardsplugin
......
......@@ -7,7 +7,7 @@ set(kmail_markdownplugin_SRCS
ecm_qt_declare_logging_category(kmail_markdownplugin_SRCS HEADER markdownplugin_debug.h IDENTIFIER KMAIL_EDITOR_MARKDOWN_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_markdownplugin)
kcoreaddons_add_plugin(kmail_markdownplugin JSON kmail_markdownplugin.json SOURCES
${kmail_markdownplugin_SRCS} INSTALL_NAMESPACE kmail)
${kmail_markdownplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditorconverttext)
target_link_libraries(kmail_markdownplugin PRIVATE
KF5::I18n KF5::XmlGui
......
......@@ -6,7 +6,7 @@ set(kmail_externalcomposereditorplugin_SRCS
)
kcoreaddons_add_plugin(kmail_externalcomposereditorplugin JSON kmail_externalcomposereditorplugin.json SOURCES
${kmail_externalcomposereditorplugin_SRCS} INSTALL_NAMESPACE kmail)
${kmail_externalcomposereditorplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditorinit)
target_link_libraries(kmail_externalcomposereditorplugin
KF5::MessageComposer KF5::XmlGui KF5::I18n KF5::KIOWidgets
......
......@@ -3,7 +3,8 @@ set(kmail_autocorrectioneditorplugin_SRCS
autocorrectionplugineditorinterface.cpp
)
kcoreaddons_add_plugin(kmail_autocorrectioneditorplugin JSON kmail_autocorrectioneditorplugin.json SOURCES ${kmail_autocorrectioneditorplugin_SRCS} INSTALL_NAMESPACE kmail)
kcoreaddons_add_plugin(kmail_autocorrectioneditorplugin JSON kmail_autocorrectioneditorplugin.json
SOURCES ${kmail_autocorrectioneditorplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditor)
target_link_libraries(kmail_autocorrectioneditorplugin
KF5::MessageComposer KF5::XmlGui KF5::I18n
......
......@@ -6,7 +6,7 @@ set(kmail_changecaseeditorplugin_SRCS
ecm_qt_declare_logging_category(kmail_changecaseeditorplugin_SRCS HEADER changecaseeditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_CHANGECASE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_changecaseeditorplugin)
kcoreaddons_add_plugin(kmail_changecaseeditorplugin JSON kmail_changecaseeditorplugin.json SOURCES
${kmail_changecaseeditorplugin_SRCS} INSTALL_NAMESPACE kmail)
${kmail_changecaseeditorplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditor)
target_link_libraries(kmail_changecaseeditorplugin
KF5::MessageComposer KF5::XmlGui KF5::I18n
......
......@@ -6,7 +6,7 @@ set(kmail_insertemaileditorplugin_SRCS
)
kcoreaddons_add_plugin(kmail_insertemaileditorplugin JSON kmail_insertemaileditorplugin.json SOURCES
${kmail_insertemaileditorplugin_SRCS} INSTALL_NAMESPACE kmail)
${kmail_insertemaileditorplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditor)
target_link_libraries(kmail_insertemaileditorplugin
KF5::MessageComposer KF5::XmlGui KF5::I18n KF5::AkonadiContact
......
......@@ -33,7 +33,7 @@ set(kmail_insertshorturleditorplugin_SRCS
ecm_qt_declare_logging_category(kmail_insertshorturleditorplugin_SRCS HEADER kmail_insertshorturl_debug.h IDENTIFIER KMAIL_INSERTSHORTURL_LOG CATEGORY_NAME org.kde.pim.kmail_insertshorturl)
kcoreaddons_add_plugin(kmail_insertshorturleditorplugin JSON kmail_insertshorturleditorplugin.json SOURCES
${kmail_insertshorturleditorplugin_SRCS} INSTALL_NAMESPACE kmail)
${kmail_insertshorturleditorplugin_SRCS} INSTALL_NAMESPACE kmail/plugineditor)
target_link_libraries(kmail_insertshorturleditorplugin
KF5::MessageComposer KF5::XmlGui KF5::I18n shorturlpluginprivate KF5::CoreAddons
......
......@@ -5,7 +5,7 @@ set(pimcommon_isgdshorturlengineplugin_SRCS
ecm_qt_declare_logging_category(pimcommon_isgdshorturlengineplugin_SRCS HEADER isgdshorturlengineplugin_debug.h IDENTIFIER ISGDSHORTURLENGINEPLUGIN_LOG CATEGORY_NAME org.kde.pim.isgdshorturlengineplugin)
kcoreaddons_add_plugin(pimcommon_isgdshorturlengineplugin JSON pimcommon_isgdshorturlengineplugin.json SOURCES
${pimcommon_isgdshorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon)
${pimcommon_isgdshorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon/shorturlengine)
target_link_libraries(pimcommon_isgdshorturlengineplugin
KF5::Service KF5::I18n Qt5::Network KF5::CoreAddons shorturlpluginprivate Qt5::Gui
......
......@@ -58,9 +58,7 @@ public:
void ShortUrlEnginePluginManagerPrivate::initializePlugins()
{
const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("pimcommon"), [](const KPluginMetaData &md) {
return md.serviceTypes().contains(QLatin1String("PimCommonShortUrlEngine/Plugin"));
});
const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("pimcommon/shorturlengine"));
QVectorIterator<KPluginMetaData> i(plugins);
i.toBack();
......
......@@ -4,7 +4,7 @@ set(pimcommon_tinyplugin_SRCS
)
kcoreaddons_add_plugin(pimcommon_tinyurlengineplugin JSON pimcommon_tinyurlengineplugin.json SOURCES
${pimcommon_tinyplugin_SRCS} INSTALL_NAMESPACE pimcommon)
${pimcommon_tinyplugin_SRCS} INSTALL_NAMESPACE pimcommon/shorturlengine)
target_link_libraries(pimcommon_tinyurlengineplugin
......
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