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
Commits
37789797
Commit
37789797
authored
Dec 30, 2021
by
Laurent Montel
Browse files
Fix some qt6 compile error
parent
58419bd8
Pipeline
#116101
passed with stage
in 4 minutes and 53 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/akonadicontrol/main.cpp
View file @
37789797
...
...
@@ -24,7 +24,7 @@
#include
<QSessionManager>
#include
<KAboutData>
#include
<KCrash
/KCrash
>
#include
<KCrash>
#include
<stdlib.h>
#ifdef HAVE_UNISTD_H
...
...
@@ -70,9 +70,9 @@ int main(int argc, char **argv)
AccountsIntegration
accountsIntegration
(
agentManager
);
#endif
KCrash
::
setEmergencySaveFunction
(
crashHandler
);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QGuiApplication
::
setFallbackSessionManagementEnabled
(
false
);
#endif
// akonadi_control is started on-demand, no need to auto restart by session.
auto
disableSessionManagement
=
[](
QSessionManager
&
sm
)
{
sm
.
setRestartHint
(
QSessionManager
::
RestartNever
);
...
...
src/core/typepluginloader_p.h
View file @
37789797
...
...
@@ -12,7 +12,12 @@
class
QObject
;
class
QString
;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template
<
typename
T
>
class
QVector
;
#else
template
<
typename
T
>
class
QList
;
#endif
namespace
Akonadi
{
...
...
src/server/storage/entities.xsl
View file @
37789797
...
...
@@ -32,10 +32,14 @@
#include
<
QtCore/QSharedDataPointer
>
#include
<
QtCore/QString
>
#include
<
QtCore/QVariant
>
#include
<
QtCore/QStringList
>
#if QT_VERSION
<
QT_VERSION_CHECK(6, 0, 0)
template
<
typename T
>
class QVector;
#else
template
<
typename T
>
class QList;
#endif
class QSqlQuery;
class QStringList;
namespace Akonadi {
namespace Server {
...
...
src/shared/akdebug.cpp
View file @
37789797
...
...
@@ -19,7 +19,7 @@
#include
<QLoggingCategory>
#include
<QMutex>
#include
<KCrash
/KCrash
>
#include
<KCrash>
#include
<cassert>
...
...
@@ -195,7 +195,8 @@ void akMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q
void
akCategoryFilter
(
QLoggingCategory
*
category
)
{
if
((
qstrcmp
(
category
->
categoryName
(),
sInstance
()
->
loggingCategory
)
==
0
)
||
(
qstrcmp
(
category
->
categoryName
(),
"org.kde.pim.akonadiprivate"
)
==
0
))
{
if
((
qstrcmp
(
category
->
categoryName
(),
sInstance
()
->
loggingCategory
.
constData
())
==
0
)
||
(
qstrcmp
(
category
->
categoryName
(),
"org.kde.pim.akonadiprivate"
)
==
0
))
{
category
->
setEnabled
(
QtDebugMsg
,
true
);
category
->
setEnabled
(
QtInfoMsg
,
true
);
category
->
setEnabled
(
QtWarningMsg
,
true
);
...
...
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