1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Tue, 1 Mar 2022 23:33:19 +0100
Subject: [PATCH] Fix akonadi includes
---
src/kjotsmodel.cpp | 2 +-
src/kjotswidget.cpp | 2 +-
src/noteshared/notecreatorandselector.cpp | 2 +-
src/noteshared/standardnoteactionmanager.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Fri, 1 Apr 2022 08:00:34 +0000
Subject: [PATCH] Fix build with Akonadi 21.12
---
src/kjotsmodel.cpp | 4 ++++
src/kjotswidget.cpp | 6 +++++-
src/noteshared/notecreatorandselector.cpp | 4 ++++
src/noteshared/standardnoteactionmanager.cpp | 4 ++++
4 files changed, 17 insertions(+), 1 deletion(-)
diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
--- a/src/kjotsmodel.cpp
+++ b/src/kjotsmodel.cpp
@@ -21,7 +21,11 @@
#include <AkonadiCore/ChangeRecorder>
#include <AkonadiCore/EntityDisplayAttribute>
#endif
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
+#include <Akonadi/NoteUtils>
+#else
#include <Akonadi/Notes/NoteUtils>
+#endif
#include <KMime/Message>
#include <KPIMTextEdit/TextUtils>
diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp
--- a/src/kjotswidget.cpp
+++ b/src/kjotswidget.cpp
@@ -34,8 +34,12 @@
#include <QDebug>
// Akonadi
-#include <Akonadi/Notes/NoteUtils>
#include <akonadi_version.h>
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
+#include <Akonadi/NoteUtils>
+#else
+#include <Akonadi/Notes/NoteUtils>
+#endif
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AttributeFactory>
#include <Akonadi/CollectionCreateJob>
diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
--- a/src/noteshared/notecreatorandselector.cpp
+++ b/src/noteshared/notecreatorandselector.cpp
@@ -24,7 +24,11 @@
#include <AkonadiCore/EntityTreeModel>
#include <AkonadiCore/ItemCreateJob>
#endif
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
+#include <Akonadi/NoteUtils>
+#else
#include <Akonadi/Notes/NoteUtils>
+#endif
#include "noteshared_debug.h"
diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
--- a/src/noteshared/standardnoteactionmanager.cpp
+++ b/src/noteshared/standardnoteactionmanager.cpp
@@ -25,7 +25,11 @@
#include <AkonadiCore/CollectionModifyJob>
#include <AkonadiCore/ItemModifyJob>
#endif
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
+#include <Akonadi/NoteUtils>
+#else
#include <Akonadi/Notes/NoteUtils>
+#endif
#include <KXmlGui/KActionCollection>
#include <KLocalizedString>
|
GitWeb