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

Fix some qt6 compile error

parent 37789797
Pipeline #116152 passed with stage
in 7 minutes and 52 seconds
......@@ -146,7 +146,7 @@ ItemFetchJob::ItemFetchJob(const QList<Item::Id> &items, QObject *parent)
d->mRequestedItems.append(Item(id));
}
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
ItemFetchJob::ItemFetchJob(const QVector<Item::Id> &items, QObject *parent)
: Job(new ItemFetchJobPrivate(this), parent)
{
......@@ -158,7 +158,7 @@ ItemFetchJob::ItemFetchJob(const QVector<Item::Id> &items, QObject *parent)
d->mRequestedItems.append(Item(id));
}
}
#endif
ItemFetchJob::ItemFetchJob(const Tag &tag, QObject *parent)
: Job(new ItemFetchJobPrivate(this), parent)
{
......
......@@ -121,13 +121,13 @@ public:
* @since 4.8
*/
explicit ItemFetchJob(const QList<Item::Id> &items, QObject *parent = nullptr);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
/**
* Convenience ctor equivalent to ItemFetchJob(const Item::List &items, QObject *parent = nullptr)
* @since 5.4
*/
explicit ItemFetchJob(const QVector<Item::Id> &items, QObject *parent = nullptr);
#endif
/**
* Creates a new item fetch job that retrieves all items tagged with specified @p tag.
*
......
......@@ -10,6 +10,7 @@
#include "job_p.h"
#include <QSet>
#include <QVariant>
using namespace Akonadi;
......
......@@ -15,8 +15,7 @@
#include "akonadicore_debug.h"
#include <KLocalizedString>
#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
......@@ -114,7 +113,7 @@ Q_GLOBAL_STATIC(ServerManagerPrivate, sInstance) // NOLINT(readability-redundant
ServerManager::ServerManager(ServerManagerPrivate *dd)
: d(dd)
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator migrate(QStringLiteral("servermanager"));
migrate.setConfigFiles(QStringList() << QStringLiteral("akonadi-firstrunrc"));
migrate.migrate();
......
......@@ -10,7 +10,7 @@
#include "akapplication.h"
#include <private/instance_p.h>
#include <KCrash/KCrash>
#include <KCrash>
#include <QTest>
......
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