Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi Contacts
Commits
eb49c7ca
Commit
eb49c7ca
authored
Feb 20, 2022
by
Laurent Montel
Browse files
Fix some qt6 compile error
parent
d238f88e
Pipeline
#140114
passed with stage
in 1 minute and 29 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
serializers/akonadi_serializer_addressee.cpp
View file @
eb49c7ca
...
...
@@ -12,6 +12,7 @@
#include
"serializer_debug.h"
#include
<KContacts/Addressee>
#include
<KLocalizedString>
#include
<QIODevice>
using
namespace
Akonadi
;
...
...
src/akonadi-contacts/attributes/contactmetadataattribute.cpp
View file @
eb49c7ca
...
...
@@ -9,6 +9,7 @@
#include
"contactmetadataattribute_p.h"
#include
<QDataStream>
#include
<QIODevice>
using
namespace
Akonadi
;
...
...
src/akonadi-contacts/grantlee/grantleecontactformatter.cpp
View file @
eb49c7ca
...
...
@@ -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
;
...
...
src/akonadi-contacts/grantlee/grantleeprint.cpp
View file @
eb49c7ca
...
...
@@ -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
)
...
...
src/contact-editor/customfields_p.h
View file @
eb49c7ca
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment