Merge remote-tracking branch 'origin/Applications/16.08'

CMakeLists.txt

@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddTests)
 
-set(PIM_VERSION "5.3.40")
+set(PIM_VERSION "5.3.41")
 set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
 set(AKONADIMIME_LIB_VERSION "5.2.80")
 set(MESSAGELIB_LIB_VERSION "5.2.80")

autotests/dummykernel.cpp

@@ -76,6 +76,12 @@ bool DummyKernel::showPopupAfterDnD()
     return false;
 }
 
+void DummyKernel::expunge(Akonadi::Collection::Id col, bool sync)
+{
+    Q_UNUSED(col);
+    Q_UNUSED(sync);
+}
+
 qreal DummyKernel::closeToQuotaThreshold()
 {
     return 80;

autotests/dummykernel.h

@@ -35,6 +35,7 @@ public:
     Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
     void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
     bool showPopupAfterDnD() Q_DECL_OVERRIDE;
+    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;

src/filter/filterimporter/autotests/filtertestkernel.cpp

@@ -92,6 +92,12 @@ bool FilterTestKernel::showPopupAfterDnD()
     return false;
 }
 
+void FilterTestKernel::expunge(Akonadi::Collection::Id col, bool sync)
+{
+    Q_UNUSED(col);
+    Q_UNUSED(sync);
+}
+
 qreal FilterTestKernel::closeToQuotaThreshold()
 {
     return 80;

src/filter/filterimporter/autotests/filtertestkernel.h

@@ -51,6 +51,7 @@ public:
     Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
     void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
     bool showPopupAfterDnD() Q_DECL_OVERRIDE;
+    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;

src/interfaces/mailinterfaces.h

@@ -67,6 +67,7 @@ public:
     virtual Akonadi::ChangeRecorder *folderCollectionMonitor() const = 0;
     virtual void updateSystemTray() = 0;
     virtual MessageComposer::MessageSender *msgSender() = 0;
+    virtual void expunge(Akonadi::Collection::Id col, bool sync) = 0;
 
     virtual ~IKernel()
     {