Commit 65dd45ac authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

In kf6 kde4 migrate code will be removed

parent bfd29ad5
Pipeline #58988 passed with stage
in 8 minutes and 37 seconds
......@@ -17,7 +17,10 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
#include <KEMailSettings> // for IdentityEntry::fromControlCenter()
#include <KLocalizedString>
#include <KSharedConfig>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include <kuser.h>
#include <QDBusConnection>
......@@ -274,6 +277,7 @@ IdentityManager::IdentityManager(bool readonly, QObject *parent, const char *nam
: QObject(parent)
, d(new Private(this))
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
static bool triedMigration = false;
if (!triedMigration) {
triedMigration = true;
......@@ -281,7 +285,7 @@ IdentityManager::IdentityManager(bool readonly, QObject *parent, const char *nam
migrate.setConfigFiles(QStringList() << QStringLiteral("emailidentities"));
migrate.migrate();
}
#endif
setObjectName(QLatin1String(name));
new IdentityManagerAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus();
......
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