Commit 777258ae authored by Laurent Montel's avatar Laurent Montel 😁

Fix compile

parent 45d067f4
...@@ -13,6 +13,9 @@ set(libimportwizard_abstract_SRCS ...@@ -13,6 +13,9 @@ set(libimportwizard_abstract_SRCS
abstract/abstractbase.cpp abstract/abstractbase.cpp
abstract/abstractdisplayinfo.cpp abstract/abstractdisplayinfo.cpp
) )
set(libimportwizard_utils_SRCS
autodetect/importwizardutil.cpp
)
ecm_qt_declare_logging_category(libimportwizard_abstract_SRCS HEADER libimportwizard_debug.h IDENTIFIER LIBIMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard.lib) ecm_qt_declare_logging_category(libimportwizard_abstract_SRCS HEADER libimportwizard_debug.h IDENTIFIER LIBIMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard.lib)
...@@ -20,23 +23,18 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wi ...@@ -20,23 +23,18 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wi
ecm_add_app_icon(importwizard_SRCS ICONS ${ICONS_SRCS}) ecm_add_app_icon(importwizard_SRCS ICONS ${ICONS_SRCS})
add_library(libimportwizard ${libimportwizard_abstract_SRCS}) add_library(libimportwizard ${libimportwizard_abstract_SRCS} ${libimportwizard_utils_SRCS})
generate_export_header(libimportwizard BASE_NAME libimportwizard) generate_export_header(libimportwizard BASE_NAME libimportwizard)
target_link_libraries(libimportwizard target_link_libraries(libimportwizard
PRIVATE PUBLIC
KF5::AkonadiCore
KF5::MailTransport KF5::MailTransport
KF5::XmlGui PRIVATE
KF5::MailImporterAkonadi KF5::Archive
KF5::PimCommon KF5::PimCommon
KF5::MailCommon KF5::MailCommon
KF5::Libkdepim
KF5::MessageViewer
KF5::Completion
KF5::I18n KF5::I18n
KF5::CoreAddons
) )
set_target_properties(libimportwizard set_target_properties(libimportwizard
...@@ -61,7 +59,6 @@ set(importwizard_manual_SRCS ...@@ -61,7 +59,6 @@ set(importwizard_manual_SRCS
set(importwizard_autodetect_SRCS set(importwizard_autodetect_SRCS
autodetect/widgets/selectprogramlistwidget.cpp autodetect/widgets/selectprogramlistwidget.cpp
autodetect/importwizardutil.cpp
autodetect/selectprogrampage.cpp autodetect/selectprogrampage.cpp
autodetect/importaddressbookpage.cpp autodetect/importaddressbookpage.cpp
autodetect/importfilterpage.cpp autodetect/importfilterpage.cpp
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "abstractimporter.h" #include "abstractimporter.h"
#include "importmailpage.h" #include "importmailpage.h"
#include "importfilterinfogui.h"
#include "importfilterpage.h" #include "importfilterpage.h"
#include "importsettingpage.h" #include "importsettingpage.h"
#include "importcalendarpage.h" #include "importcalendarpage.h"
...@@ -29,6 +28,7 @@ ...@@ -29,6 +28,7 @@
#include "MailCommon/FilterManager" #include "MailCommon/FilterManager"
#include <MailImporterAkonadi/FilterImporterAkonadi> #include <MailImporterAkonadi/FilterImporterAkonadi>
#include <QFileInfo>
#include <QFile> #include <QFile>
using namespace LibImportWizard; using namespace LibImportWizard;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "importwizardutil.h" #include "importwizardutil.h"
#include <KSharedConfig> #include <KSharedConfig>
#include <KConfigGroup> #include <KConfigGroup>
#include "importwizard_debug.h" #include "libimportwizard_debug.h"
#include <kwallet.h> #include <kwallet.h>
#include <AkonadiCore/Tag> #include <AkonadiCore/Tag>
#include <AkonadiCore/TagAttribute> #include <AkonadiCore/TagAttribute>
...@@ -62,7 +62,7 @@ void ImportWizardUtil::mergeLdap(const ldapStruct &ldap) ...@@ -62,7 +62,7 @@ void ImportWizardUtil::mergeLdap(const ldapStruct &ldap)
grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("PLAIN")); grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("PLAIN"));
grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("Simple")); grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("Simple"));
} else { } else {
qCDebug(IMPORTWIZARD_LOG) << " Mech SASL undefined" << ldap.saslMech; qCDebug(LIBIMPORTWIZARD_LOG) << " Mech SASL undefined" << ldap.saslMech;
} }
grp.writeEntry(QStringLiteral("SelectedVersion%1").arg(numberOfLdapSelected), QString::number(3)); grp.writeEntry(QStringLiteral("SelectedVersion%1").arg(numberOfLdapSelected), QString::number(3));
grp.writeEntry(QStringLiteral("SelectedBind%1").arg(numberOfLdapSelected), ldap.dn); grp.writeEntry(QStringLiteral("SelectedBind%1").arg(numberOfLdapSelected), ldap.dn);
......
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