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

Fix some qt6 compile error

parent d238f88e
Pipeline #140114 passed with stage
in 1 minute and 29 seconds
......@@ -12,6 +12,7 @@
#include "serializer_debug.h"
#include <KContacts/Addressee>
#include <KLocalizedString>
#include <QIODevice>
using namespace Akonadi;
......
......@@ -9,6 +9,7 @@
#include "contactmetadataattribute_p.h"
#include <QDataStream>
#include <QIODevice>
using namespace Akonadi;
......
......@@ -104,7 +104,7 @@ public:
std::unique_ptr<KTextTemplate::Engine> mEngine;
QSharedPointer<KTextTemplate::FileSystemTemplateLoader> mTemplateLoader;
KTextTemplate::Template mSelfcontainedTemplate;
v::Template mEmbeddableTemplate;
KTextTemplate::Template mEmbeddableTemplate;
#endif
QString mErrorMessage;
bool forceDisableQRCode = false;
......
......@@ -53,7 +53,11 @@ GrantleePrint::~GrantleePrint() = default;
void GrantleePrint::init()
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Grantlee::registerMetaType<QUrl>();
#else
KTextTemplate::registerMetaType<QUrl>();
#endif
}
QString GrantleePrint::contactsToHtml(const KContacts::Addressee::List &contacts)
......
......@@ -12,8 +12,12 @@
#include <QString>
#include <QVariant>
#include <QVector>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template<typename T> class QVector;
#else
template<typename T>
class QList;
#endif
/**
* @short A class that represents non-standard contact fields.
......
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