Help to make it compile against qt6

src/identity.cpp

@@ -24,8 +24,9 @@ Q_DECLARE_METATYPE(KIdentityManagement::Signature)
 Identity::Identity(const QString &id, const QString &fullName, const QString &emailAddr, const QString &organization, const QString &replyToAddr)
 {
     qRegisterMetaType<Signature>();
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qRegisterMetaTypeStreamOperators<Signature>();
-
+#endif
     setProperty(QLatin1String(s_uoid), 0);
     setProperty(QLatin1String(s_identity), id);
     setProperty(QLatin1String(s_name), fullName);

src/identitymanager.cpp

@@ -18,8 +18,7 @@ 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)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
 #endif
 #include <kuser.h>
@@ -277,7 +276,7 @@ IdentityManager::IdentityManager(bool readonly, QObject *parent, const char *nam
     : QObject(parent)
     , d(new IdentityManagerPrivate(this))
 {
-#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     static bool triedMigration = false;
     if (!triedMigration) {
         triedMigration = true;

src/signature.h

@@ -13,6 +13,7 @@
 
 #include <QHash>
 #include <QImage>
+#include <QSharedPointer>
 #include <QString>
 #include <memory>