Skip to content
GitLab
Menu
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
69751df7
Commit
69751df7
authored
Feb 20, 2022
by
Laurent Montel
😁
Browse files
Make it compile against qt6
parent
eb49c7ca
Pipeline
#140115
failed with stage
in 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/akonadi-contacts/contactviewer.cpp
View file @
69751df7
...
...
@@ -26,12 +26,12 @@
#include <KConfig>
#include <KContacts/VCardConverter>
#include <Prison/Prison>
#include <QGuiApplication>
#include <QIcon>
#include <QScreen>
#include <QUrlQuery>
#include <QVBoxLayout>
#include <prison/Prison>
using
namespace
Akonadi
;
...
...
src/akonadi-contacts/grantlee/grantleecontactformatter.cpp
View file @
69751df7
...
...
@@ -259,10 +259,11 @@ QString GrantleeContactFormatter::toHtml(HtmlForm form) const
mapping
.
insert
(
QStringLiteral
(
"hasqrcode"
),
!
d
->
forceDisableQRCode
&&
d
->
showQRCode
);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Grantlee
::
Context
context
(
mapping
);
context
.
setLocalizer
(
d
->
mEngine
->
localizer
());
#else
KTextTemplate
::
Context
context
(
mapping
);
// TODO context.setLocalizer(d->mEngine->localizer());
#endif
context
.
setLocalizer
(
d
->
mEngine
->
localizer
());
if
(
form
==
SelfcontainedForm
)
{
return
d
->
mSelfcontainedTemplate
->
render
(
&
context
);
...
...
@@ -275,5 +276,9 @@ QString GrantleeContactFormatter::toHtml(HtmlForm form) const
void
GrantleeContactFormatter
::
setApplicationDomain
(
const
QByteArray
&
domain
)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
d
->
mEngine
->
localizer
()
->
setApplicationDomain
(
domain
);
#else
// TODO qt6
#endif
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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