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

In kf6 kde4 migration code will be removed

parent 88ce1d28
Pipeline #59129 passed with stage
in 14 minutes and 3 seconds
...@@ -11,7 +11,10 @@ ...@@ -11,7 +11,10 @@
#include "aboutdata.h" #include "aboutdata.h"
#include "kwatchgnupgmainwin.h" #include "kwatchgnupgmainwin.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator> #include <Kdelibs4ConfigMigrator>
#endif
#include "utils/kuniqueservice.h" #include "utils/kuniqueservice.h"
#include <KLocalizedString> #include <KLocalizedString>
...@@ -26,10 +29,12 @@ int main(int argc, char **argv) ...@@ -26,10 +29,12 @@ int main(int argc, char **argv)
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
QApplication app(argc, argv); QApplication app(argc, argv);
KCrash::initialize(); KCrash::initialize();
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator migrate(QStringLiteral("kwatchgnupg")); Kdelibs4ConfigMigrator migrate(QStringLiteral("kwatchgnupg"));
migrate.setConfigFiles(QStringList() << QStringLiteral("kwatchgnupgrc")); migrate.setConfigFiles(QStringList() << QStringLiteral("kwatchgnupgrc"));
migrate.setUiFiles(QStringList() << QStringLiteral("kwatchgnupgui.rc")); migrate.setUiFiles(QStringList() << QStringLiteral("kwatchgnupgui.rc"));
migrate.migrate(); migrate.migrate();
#endif
KLocalizedString::setApplicationDomain("kwatchgnupg"); KLocalizedString::setApplicationDomain("kwatchgnupg");
AboutData aboutData; AboutData aboutData;
......
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
#include "kleopatraapplication.h" #include "kleopatraapplication.h"
#include "mainwindow.h" #include "mainwindow.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator> #include <Kdelibs4ConfigMigrator>
#endif
#include <commands/reloadkeyscommand.h> #include <commands/reloadkeyscommand.h>
#include <commands/selftestcommand.h> #include <commands/selftestcommand.h>
...@@ -151,13 +154,13 @@ int main(int argc, char **argv) ...@@ -151,13 +154,13 @@ int main(int argc, char **argv)
parser.process(QApplication::arguments()); parser.process(QApplication::arguments());
aboutData.processCommandLine(&parser); aboutData.processCommandLine(&parser);
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator migrate(QStringLiteral("kleopatra")); Kdelibs4ConfigMigrator migrate(QStringLiteral("kleopatra"));
migrate.setConfigFiles(QStringList() << QStringLiteral("kleopatrarc") migrate.setConfigFiles(QStringList() << QStringLiteral("kleopatrarc")
<< QStringLiteral("libkleopatrarc")); << QStringLiteral("libkleopatrarc"));
migrate.setUiFiles(QStringList() << QStringLiteral("kleopatra.rc")); migrate.setUiFiles(QStringList() << QStringLiteral("kleopatra.rc"));
migrate.migrate(); migrate.migrate();
#endif
qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: Application created"; qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: Application created";
// Initialize GpgME // Initialize GpgME
......
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