Adapt to move of some Akonadi attributes to AkonadiMime

The Pop3ResourceAttribute and NewMailNotifierAttribute has been moved
from Akonadi to AkonadiMime, since they are all email-specific.
wilder
Daniel Vrátil 6 years ago
parent 18ca1efa73
commit 41cd5da108
No known key found for this signature in database
GPG Key ID: 4D69557AECB13683
  1. 2
      CMakeLists.txt
  2. 2
      agents/mailfilteragent/mailfilteragent.cpp
  3. 2
      src/kmsystemtray.cpp
  4. 2
      src/unityservicemanager.cpp

@ -43,7 +43,7 @@ endif()
set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
set(AKONADI_MIMELIB_VERSION "5.14.41")
set(AKONADI_MIMELIB_VERSION "5.14.43")
set(AKONADI_CONTACT_VERSION "5.14.40")
set(CALENDARUTILS_LIB_VERSION "5.14.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.40")

@ -24,7 +24,6 @@
#include "filterlogdialog.h"
#include "filtermanager.h"
#include "mailfilteragentadaptor.h"
#include <AkonadiCore/Pop3ResourceAttribute>
#include <AkonadiCore/ServerManager>
#include <AkonadiCore/changerecorder.h>
@ -34,6 +33,7 @@
#include <AkonadiCore/itemfetchscope.h>
#include <Akonadi/KMime/MessageParts>
#include <Akonadi/KMime/MessageStatus>
#include <Akonadi/KMime/Pop3ResourceAttribute>
#include <AkonadiCore/session.h>
#include <MailCommon/MailKernel>
#include <KLocalizedString>

@ -25,7 +25,7 @@
#include <MailCommon/MailUtil>
#include <MailCommon/MailKernel>
#include <MailCommon/FolderTreeView>
#include <AkonadiCore/NewMailNotifierAttribute>
#include <Akonadi/KMime/NewMailNotifierAttribute>
#include <KWindowSystem>
#include "kmail_debug.h"

@ -38,7 +38,7 @@
#include <AkonadiCore/EntityTreeModel>
#include <AkonadiCore/EntityMimeTypeFilterModel>
#include <AkonadiCore/CollectionStatistics>
#include <AkonadiCore/NewMailNotifierAttribute>
#include <Akonadi/KMime/NewMailNotifierAttribute>
using namespace KMail;

Loading…
Cancel
Save