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

Fix compile against qt6

parent dcada425
Pipeline #182310 passed with stage
in 1 minute and 11 seconds
......@@ -11,8 +11,7 @@
#include <KLocalizedString>
#include <QApplication>
#include <QIcon>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include "importwizard-version.h"
......@@ -26,9 +25,11 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
#endif
QApplication app(argc, argv);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#endif
KCrash::initialize();
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator migrate(QStringLiteral("importwizard"));
migrate.setConfigFiles(QStringList() << QStringLiteral("importwizardrc"));
migrate.migrate();
......
......@@ -14,7 +14,9 @@
TrojitaAddressBook::TrojitaAddressBook(const QString &filename)
{
settings = new QSettings(filename, QSettings::IniFormat, this);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings->setIniCodec("UTF-8");
#endif
}
TrojitaAddressBook::~TrojitaAddressBook()
......
Supports Markdown
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