Commit d3032c99 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Install plugin in pim<version>

parent 70b149f5
Pipeline #186787 passed with stage
in 5 minutes and 58 seconds
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
include_directories(${kaddressbook_SOURCE_DIR})
configure_file(kaddressbookplugin.json.cmake ${CMAKE_CURRENT_BINARY_DIR}/kaddressbookplugin.json )
add_library(kontact_kaddressbookplugin MODULE)
target_sources(kontact_kaddressbookplugin PRIVATE
......
......@@ -34,7 +34,7 @@
],
"Version": "0.1"
},
"X-KDE-ConfigModuleNamespace": "pim/kcms/kaddressbook/",
"X-KDE-ConfigModuleNamespace": "pim@QT_MAJOR_VERSION@/kcms/kaddressbook/",
"X-KDE-KontactPartExecutableName": "kaddressbook",
"X-KDE-KontactPartLibraryName": "kaddressbookpart",
"X-KDE-KontactPartLoadOnStart": false,
......
......@@ -26,7 +26,7 @@ target_link_libraries(kaddressbook_config_plugins
KPimAddressbookImportExport
)
install(TARGETS kaddressbook_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/kaddressbook)
install(TARGETS kaddressbook_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/kaddressbook)
##################################################
if (TARGET KUserFeedbackWidgets)
......@@ -48,6 +48,6 @@ if (TARGET KUserFeedbackWidgets)
KUserFeedbackWidgets
)
install(TARGETS kaddressbook_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/kaddressbook)
install(TARGETS kaddressbook_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/kaddressbook)
endif()
......@@ -368,7 +368,8 @@ void MainWidget::initializeImportExportPlugin(KActionCollection *collection)
void MainWidget::configure()
{
QPointer<KCMultiDialog> dlg = new KCMultiDialog(this);
const QVector<KPluginMetaData> availablePlugins = KPluginMetaData::findPlugins(QStringLiteral("pim/kcms/kaddressbook"));
const QVector<KPluginMetaData> availablePlugins =
KPluginMetaData::findPlugins(QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kcms/kaddressbook"));
for (const KPluginMetaData &metaData : availablePlugins) {
dlg->addModule(metaData);
}
......
Supports Markdown
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