Commit 499a136c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/15.12'

parents f8dadce7 2f15aeed
#define AKONADI_CONTACT_LIB "${LIB_INSTALL_DIR}"
#define AKONADI_CONTACT_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define AKONADI_CONTACT_LIB "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}"
#define AKONADI_CONTACT_PREFIX ""
......@@ -495,8 +495,9 @@ void ContactEditorWidget::Private::loadCustomPages()
qDeleteAll(mCustomPages);
mCustomPages.clear();
const QString pluginDirectory = QStringLiteral("%1/%2/akonadi/contact/editorpageplugins/").arg(QStringLiteral(AKONADI_CONTACT_LIB)).arg(QStringLiteral(AKONADI_CONTACT_PREFIX));
const QString pluginDirectory = QStringLiteral("%1/akonadi/contact/editorpageplugins/").arg(QStringLiteral(AKONADI_CONTACT_LIB));
QDirIterator it(pluginDirectory, QDir::Files);
while (it.hasNext()) {
QPluginLoader loader(it.next());
if (!loader.load()) {
......
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