summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-10 08:00:38 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-10 08:00:38 (GMT)
commit4702ce496c712db778777185f6af080723a9c7a4 (patch)
treef71bfbf1a0bf690934950a01d7b3bb08d9c6b031
parent4eaf7e6bf187b868bd54ff311266f2ad0cc2222e (diff)
USe new API
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp2
-rw-r--r--kaddressbook/importexportplugins/shared/CMakeLists.txt1
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12fe919..e60ab63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(GRANTLEETHEME_LIB_VERSION "5.3.40")
set(CALENDARSUPPORT_LIB_VERSION "5.3.40")
set(EVENTVIEW_LIB_VERSION "5.3.40")
set(LIBKDEPIM_LIB_VERSION "5.3.40")
-set(KDEPIM_APPS_LIB_VERSION "5.3.45")
+set(KDEPIM_APPS_LIB_VERSION "5.3.47")
set(LIBKLEO_LIB_VERSION "5.3.40")
set(AKONADI_LIB_VERSION "5.3.45")
set(INCIDENCEEDITOR_LIB_VERSION "5.3.40")
diff --git a/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp b/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
index a803ced..ab57a9a 100644
--- a/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/ldap/ldapimportexportplugininterface.cpp
@@ -80,7 +80,7 @@ void LDapImportExportPluginInterface::importLdap()
mEngine = new ImportExportEngine(this);
}
mEngine->setContactList(contactList);
- //TODO mEngine->setDefaultAddressBook();
+ mEngine->setDefaultAddressBook(defaultCollection());
connect(mEngine, &ImportExportEngine::finished, this, &LDapImportExportPluginInterface::slotFinished);
mEngine->importContacts();
}
diff --git a/kaddressbook/importexportplugins/shared/CMakeLists.txt b/kaddressbook/importexportplugins/shared/CMakeLists.txt
index 8b4fb1e..330412a 100644
--- a/kaddressbook/importexportplugins/shared/CMakeLists.txt
+++ b/kaddressbook/importexportplugins/shared/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../)
set(kaddressbookimportexportprivatelib_SRCS
importexportengine.cpp
)