Commit 7e62c3f3 authored by Laurent Montel's avatar Laurent Montel 😁

Port to new api

parent df65a92d
......@@ -135,7 +135,7 @@ else()
find_package(Grantlee5 "5.1" CONFIG REQUIRED)
set(LIBGRAVATAR_VERSION_LIB "5.2.80")
set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
......
......@@ -54,7 +54,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
......
......@@ -47,7 +47,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
......
......@@ -121,3 +121,10 @@ void ImportWizardKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
Q_UNUSED(col);
}
void ImportWizardKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -54,6 +54,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;
......@@ -61,6 +62,7 @@ private:
MailCommon::FolderCollectionMonitor *mFolderCollectionMonitor;
Akonadi::EntityTreeModel *mEntityTreeModel;
Akonadi::EntityMimeTypeFilterModel *mCollectionModel;
};
#endif
......@@ -47,7 +47,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kaddressbook_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintSupport)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.80")
......
......@@ -53,7 +53,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kalarm_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets)
find_package(Qt5X11Extras NO_MODULE)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
set(KCALENDARCORE_LIB_VERSION "5.2.80")
set(CALENDARUTILS_LIB_VERSION "5.2.80")
......
......@@ -62,7 +62,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets Xml)
set(LIBGRAVATAR_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
......
......@@ -122,3 +122,10 @@ void ArchiveMailKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
Q_UNUSED(col);
}
void ArchiveMailKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -55,6 +55,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;
......
......@@ -104,3 +104,10 @@ void DummyKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
Q_UNUSED(col);
}
void DummyKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -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;
......
......@@ -2201,3 +2201,10 @@ void KMKernel::setShuttingDown(bool flag)
{
the_shuttingDown = flag;
}
void KMKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -368,6 +368,7 @@ public:
void init();
void setupDBus();
void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
/**
......
......@@ -47,7 +47,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kontact_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Widgets WebEngine WebEngineWidgets)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.80")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
......
......@@ -61,7 +61,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${korganizer_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
find_package(Qt5X11Extras NO_MODULE)
#find_package(Grantlee5 "5.1" CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
......
......@@ -46,7 +46,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${mboximporter_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui Widgets)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
# Find KF5 package
find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
......
......@@ -119,3 +119,10 @@ void MBoxImporterKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
{
Q_UNUSED(col);
}
void MBoxImporterKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -54,6 +54,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;
......
......@@ -50,7 +50,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${pimsettingexporter_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.81")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
set(AKONADIKALARM_LIB_VERSION "5.2.80")
set(KCALENDARCORE_LIB_VERSION "5.2.80")
......
......@@ -132,3 +132,8 @@ void PimSettingExporterKernel::setLastSelectedFolder(Akonadi::Collection::Id col
Q_UNUSED(col);
}
void PimSettingExporterKernel::expunge(Akonadi::Collection::Id col, bool sync)
{
Q_UNUSED(col);
Q_UNUSED(sync);
}
......@@ -54,6 +54,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;
......
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