Commit 557e9ec6 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

In kf6 kde4 migration code will be removed

parent 34dfe233
Pipeline #58987 passed with stage
in 4 minutes and 57 seconds
...@@ -15,7 +15,10 @@ ...@@ -15,7 +15,10 @@
#include <specialcollectionattribute.h> #include <specialcollectionattribute.h>
#include <KLocalizedString> #include <KLocalizedString>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator> #include <Kdelibs4ConfigMigrator>
#endif
using namespace Akonadi; using namespace Akonadi;
...@@ -64,10 +67,11 @@ SpecialMailCollectionsPrivate::~SpecialMailCollectionsPrivate() ...@@ -64,10 +67,11 @@ SpecialMailCollectionsPrivate::~SpecialMailCollectionsPrivate()
static KCoreConfigSkeleton *getConfig(const QString &filename) static KCoreConfigSkeleton *getConfig(const QString &filename)
{ {
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator migrate(QStringLiteral("specialmailcollection")); Kdelibs4ConfigMigrator migrate(QStringLiteral("specialmailcollection"));
migrate.setConfigFiles(QStringList() << filename); migrate.setConfigFiles(QStringList() << filename);
migrate.migrate(); migrate.migrate();
#endif
Settings::instance(ServerManager::addNamespace(filename)); Settings::instance(ServerManager::addNamespace(filename));
return Settings::self(); return Settings::self();
} }
......
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