Use directly QT_VERSION

notesagent/notesagent.cpp

@@ -13,8 +13,7 @@
 
 #include <Akonadi/ServerManager>
 
-#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
 
@@ -24,7 +23,7 @@
 NotesAgent::NotesAgent(const QString &id)
     : Akonadi::AgentBase(id)
 {
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     Kdelibs4ConfigMigrator migrate(QStringLiteral("notesagent"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("akonadi_notes_agentrc") << QStringLiteral("akonadi_notes_agent.notifyrc"));
     migrate.migrate();

src/apps/main.cpp

@@ -10,8 +10,7 @@
 #include "knotes-version.h"
 #include "knotes_debug.h"
 #include "knotes_options.h"
-#include <kcoreaddons_version.h>
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include "notes/knotesmigrateapplication.h"
 #endif
 #include <KLocalizedString>
@@ -33,11 +32,11 @@ int main(int argc, char *argv[])
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
-#endif
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+#endif
     Application app(argc, &argv);
     KCrash::initialize();
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     KNotesMigrateApplication migrate;
     migrate.migrate();
 #endif

src/configdialog/knoteconfigdialog.cpp

@@ -13,7 +13,6 @@
 #include "notesharedglobalconfig.h"
 #include "print/knoteprintselectthemecombobox.h"
 #include <config-knotes.h>
-#include <kcoreaddons_version.h>
 
 #include <KAuthorized>
 #include <KNS3/DownloadDialog>

src/notes/knotesmigrateapplication.cpp

@@ -4,7 +4,7 @@
    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "knotesmigrateapplication.h"
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
 
 KNotesMigrateApplication::KNotesMigrateApplication()

src/notes/knotesmigrateapplication.h

@@ -5,8 +5,7 @@
 */
 #pragma once
 #include <QObject>
-#include <kcoreaddons_version.h>
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include "knotes_export.h"
 #include <PimCommon/MigrateApplicationFiles>