From 777258ae5320b4f4f8a40dfd0b0736ed995787d7 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 18 Apr 2017 13:36:08 +0200
Subject: [PATCH] Fix compile

---
 src/CMakeLists.txt                  | 17 +++++++----------
 src/abstract/abstractimporter.cpp   |  2 +-
 src/autodetect/importwizardutil.cpp |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bad4b6..6366371 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,9 @@ set(libimportwizard_abstract_SRCS
     abstract/abstractbase.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)
 
@@ -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})
 
 
-add_library(libimportwizard ${libimportwizard_abstract_SRCS})
+add_library(libimportwizard ${libimportwizard_abstract_SRCS} ${libimportwizard_utils_SRCS})
 
 generate_export_header(libimportwizard BASE_NAME libimportwizard)
 
 target_link_libraries(libimportwizard
-    PRIVATE
-    KF5::AkonadiCore
+    PUBLIC
     KF5::MailTransport
-    KF5::XmlGui
-    KF5::MailImporterAkonadi
+    PRIVATE
+    KF5::Archive
     KF5::PimCommon
     KF5::MailCommon
-    KF5::Libkdepim
-    KF5::MessageViewer
-    KF5::Completion
     KF5::I18n
-    KF5::CoreAddons
     )
 
 set_target_properties(libimportwizard
@@ -61,7 +59,6 @@ set(importwizard_manual_SRCS
 
 set(importwizard_autodetect_SRCS
     autodetect/widgets/selectprogramlistwidget.cpp
-    autodetect/importwizardutil.cpp
     autodetect/selectprogrampage.cpp
     autodetect/importaddressbookpage.cpp
     autodetect/importfilterpage.cpp
diff --git a/src/abstract/abstractimporter.cpp b/src/abstract/abstractimporter.cpp
index 6943853..7f17ac7 100644
--- a/src/abstract/abstractimporter.cpp
+++ b/src/abstract/abstractimporter.cpp
@@ -19,7 +19,6 @@
 
 #include "abstractimporter.h"
 #include "importmailpage.h"
-#include "importfilterinfogui.h"
 #include "importfilterpage.h"
 #include "importsettingpage.h"
 #include "importcalendarpage.h"
@@ -29,6 +28,7 @@
 #include "MailCommon/FilterManager"
 #include <MailImporterAkonadi/FilterImporterAkonadi>
 
+#include <QFileInfo>
 #include <QFile>
 
 using namespace LibImportWizard;
diff --git a/src/autodetect/importwizardutil.cpp b/src/autodetect/importwizardutil.cpp
index 02ce574..a836fca 100644
--- a/src/autodetect/importwizardutil.cpp
+++ b/src/autodetect/importwizardutil.cpp
@@ -20,7 +20,7 @@
 #include "importwizardutil.h"
 #include <KSharedConfig>
 #include <KConfigGroup>
-#include "importwizard_debug.h"
+#include "libimportwizard_debug.h"
 #include <kwallet.h>
 #include <AkonadiCore/Tag>
 #include <AkonadiCore/TagAttribute>
@@ -62,7 +62,7 @@ void ImportWizardUtil::mergeLdap(const ldapStruct &ldap)
         grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("PLAIN"));
         grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("Simple"));
     } 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("SelectedBind%1").arg(numberOfLdapSelected), ldap.dn);
-- 
GitLab