Commit f147577e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new api

parent 55d49d27
Pipeline #23510 passed with stage
in 58 minutes and 3 seconds
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.14.46") set(PIM_VERSION "5.14.47")
if (POLICY CMP0053) if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0053 NEW)
...@@ -19,7 +19,7 @@ set(MESSAGELIB_LIB_VERSION ${PIM_VERSION}) ...@@ -19,7 +19,7 @@ set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.14.42") set(AKONADIMIME_LIB_VERSION "5.14.42")
set(QT_REQUIRED_VERSION "5.13.0") set(QT_REQUIRED_VERSION "5.13.0")
set(AKONADICONTACT_LIB_VERSION "5.14.41")
set(AKONADI_VERSION "5.14.40") set(AKONADI_VERSION "5.14.40")
set(GRANTLEETHEME_LIB_VERSION "5.14.40") set(GRANTLEETHEME_LIB_VERSION "5.14.40")
set(GRAVATAR_LIB_VERSION "5.14.41") set(GRAVATAR_LIB_VERSION "5.14.41")
...@@ -32,7 +32,7 @@ set(KMIME_LIB_VERSION "5.14.40") ...@@ -32,7 +32,7 @@ set(KMIME_LIB_VERSION "5.14.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.14.45") set(KPIMTEXTEDIT_LIB_VERSION "5.14.45")
set(LIBKDEPIM_LIB_VERSION "5.14.45") set(LIBKDEPIM_LIB_VERSION "5.14.45")
set(LIBKLEO_LIB_VERSION "5.14.40") set(LIBKLEO_LIB_VERSION "5.14.40")
set(PIMCOMMON_LIB_VERSION "5.14.43") set(PIMCOMMON_LIB_VERSION "5.14.44")
set(GPGME_LIB_VERSION "1.11.1") set(GPGME_LIB_VERSION "1.11.1")
set(AKONADI_CONTACT_VERSION "5.14.40") set(AKONADI_CONTACT_VERSION "5.14.40")
...@@ -98,6 +98,7 @@ find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIR ...@@ -98,6 +98,7 @@ find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIR
find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiSearch "5.14.40" CONFIG REQUIRED) find_package(KF5AkonadiSearch "5.14.40" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://kde.org/" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://kde.org/" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
......
...@@ -219,7 +219,7 @@ target_link_libraries(KF5MessageComposer ...@@ -219,7 +219,7 @@ target_link_libraries(KF5MessageComposer
PUBLIC PUBLIC
KF5::Mime KF5::Mime
KF5::MessageCore KF5::MessageCore
KF5::PimCommon KF5::PimCommonAkonadi
KF5::AkonadiCore KF5::AkonadiCore
KF5::IdentityManagement KF5::IdentityManagement
KF5::AkonadiMime KF5::AkonadiMime
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <MessageCore/StringUtil> #include <MessageCore/StringUtil>
#include <PimCommon/BroadcastStatus> #include <PimCommon/BroadcastStatus>
#include <LibkdepimAkonadi/OpenEmailAddressJob> #include <Akonadi/Contact/OpenEmailAddressJob>
#include <Akonadi/Contact/ContactSearchJob> #include <Akonadi/Contact/ContactSearchJob>
...@@ -602,7 +602,7 @@ static QString searchFullEmailByUid(const QString &uid) ...@@ -602,7 +602,7 @@ static QString searchFullEmailByUid(const QString &uid)
static void runKAddressBook(const QUrl &url) static void runKAddressBook(const QUrl &url)
{ {
KPIM::OpenEmailAddressJob *job = new KPIM::OpenEmailAddressJob(url.path(), nullptr); Akonadi::OpenEmailAddressJob *job = new Akonadi::OpenEmailAddressJob(url.path(), nullptr);
job->start(); job->start();
} }
......
...@@ -29,7 +29,7 @@ using KContacts::Addressee; ...@@ -29,7 +29,7 @@ using KContacts::Addressee;
#include <ContactDefaultActions> #include <ContactDefaultActions>
#include <KLocalizedString> #include <KLocalizedString>
#include <LibkdepimAkonadi/AddContactJob> #include <Akonadi/Contact/AddContactJob>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <KConfigGroup> #include <KConfigGroup>
#include <QPushButton> #include <QPushButton>
...@@ -113,7 +113,7 @@ void VCardViewer::slotUser1() ...@@ -113,7 +113,7 @@ void VCardViewer::slotUser1()
{ {
const KContacts::Addressee contact = mAddresseeList.at(mAddresseeListIndex); const KContacts::Addressee contact = mAddresseeList.at(mAddresseeListIndex);
KPIM::AddContactJob *job = new KPIM::AddContactJob(contact, this, this); Akonadi::AddContactJob *job = new Akonadi::AddContactJob(contact, this, this);
job->start(); job->start();
} }
......
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