Commit 65a1541e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

install plugins in pim<version>

parent f28498c7
Pipeline #186709 passed with stage
in 10 minutes and 26 seconds
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(PIM_VERSION "5.20.41")
set(PIM_VERSION "5.20.42")
project(Akonadi VERSION ${PIM_VERSION})
......
......@@ -66,7 +66,7 @@ class AgentConfigurationBasePrivate;
* value must match the name of the @p X-Akonadi-Identifier value from the agent's
* desktop file.
*
* The plugin binary should be installed into akonadi/config subdirectory in one
* The plugin binary should be installed into pim<version>/akonadi/config subdirectory in one
* of the paths search by QCoreApplication::libraryPaths().
*/
......
......@@ -79,8 +79,9 @@ bool AgentConfigurationManager::isInstanceRegistered(const QString &instance) co
QString AgentConfigurationManager::findConfigPlugin(const QString &type) const
{
const auto libPaths = QCoreApplication::libraryPaths();
const QString prefixPluginPath = QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/akonadi/config");
for (const auto &libPath : libPaths) {
const QString pluginPath = QStringLiteral("%1/akonadi/config/").arg(libPath);
const QString pluginPath = QStringLiteral("%1/%2/").arg(libPath, prefixPluginPath);
const auto libs = QDir(pluginPath).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
for (const auto &lib : libs) {
QPluginLoader loader(lib.absoluteFilePath());
......
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