diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/src/pimcommonakonadi/CMakeLists.txt b/src/pimcommonakonadi/CMakeLists.txt --- a/src/pimcommonakonadi/CMakeLists.txt +++ b/src/pimcommonakonadi/CMakeLists.txt @@ -115,7 +115,6 @@ KF5::LibkdepimAkonadi KF5::Codecs KF5::PimTextEdit - KF5::DBusAddons KF5::XmlGui KF5::PimTextEdit KF5::KIOWidgets diff --git a/src/pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp b/src/pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp --- a/src/pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp +++ b/src/pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp @@ -22,10 +22,10 @@ #include -#include #include #include +#include #include #include #include @@ -69,7 +69,7 @@ d->mCurrentCollection.resource()); QDBusInterface iface(service, QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"), - KDBusConnectionPool::threadConnection(), this); + QDBusConnection::sessionBus(), this); if (!iface.isValid()) { qCDebug(PIMCOMMONAKONADI_LOG) << "Cannot create imap dbus interface for service " << service; deleteLater(); diff --git a/src/pimcommonakonadi/util/imapresourcecapabilitiesmanager.cpp b/src/pimcommonakonadi/util/imapresourcecapabilitiesmanager.cpp --- a/src/pimcommonakonadi/util/imapresourcecapabilitiesmanager.cpp +++ b/src/pimcommonakonadi/util/imapresourcecapabilitiesmanager.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ = Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, identifier); QDBusInterface iface(service, QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"), - KDBusConnectionPool::threadConnection(), this); + QDBusConnection::sessionBus(), this); if (iface.isValid()) { QDBusPendingCall call = iface.asyncCall(QStringLiteral("serverCapabilities"));