Commit ea4183bc authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

in kf6 we will remove this class

(see T11584)
parent 26270830
Pipeline #58728 passed with stage
in 23 minutes and 16 seconds
......@@ -17,7 +17,10 @@
#include "foldershortcutactionmanager.h"
#include "kmail_debug.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "kmmigrateapplication.h"
#endif
#include "tag/tagactionmanager.h"
#include <AkonadiCore/changerecorder.h>
#include <AkonadiCore/collection.h>
......@@ -41,10 +44,10 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList
, mParentWidget(parentWidget)
{
setComponentName(QStringLiteral("kmail2"), i18n("KMail2"));
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
KMMigrateApplication migrate;
migrate.migrate();
#endif
// local, do the init
auto mKMailKernel = new KMKernel();
mKMailKernel->init();
......
......@@ -5,6 +5,7 @@
*/
#include "kmmigrateapplication.h"
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <KIdentityManagement/Identity>
#include <KIdentityManagement/IdentityManager>
#include <Kdelibs4ConfigMigrator>
......@@ -121,3 +122,4 @@ void KMMigrateApplication::migrateAlwaysEncrypt()
mgr.commit();
}
}
#endif
......@@ -8,6 +8,8 @@
#include "kmail_export.h"
#include <PimCommon/MigrateApplicationFiles>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
class KMAIL_EXPORT KMMigrateApplication
{
public:
......@@ -22,3 +24,4 @@ private:
PimCommon::MigrateApplicationFiles mMigrator;
};
#endif
......@@ -10,7 +10,10 @@
#include "kmail_options.h"
#include "kmkernel.h" //control center
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "kmmigrateapplication.h"
#endif
#include "kmail_debug.h"
#undef Status // stupid X headers
......@@ -146,10 +149,10 @@ int main(int argc, char *argv[])
qCDebug(KMAIL_LOG) << "Another instance of KMail already running";
return 0;
}
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
KMMigrateApplication migrate;
migrate.migrate();
#endif
// local, do the init
KMKernel kmailKernel;
kmailKernel.init();
......
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