Adapt to KAddressbookGrantlee being moved into AkonadiContacts

CMakeLists.txt

@@ -70,7 +70,6 @@ set(GRANTLEETHEME_LIB_VERSION "5.15.40")
 set(CALENDARSUPPORT_LIB_VERSION "5.15.40")
 set(EVENTVIEW_LIB_VERSION "5.15.40")
 set(LIBKDEPIM_LIB_VERSION "5.15.40")
-set(KDEPIM_APPS_LIB_VERSION "5.15.40")
 set(LIBKLEO_LIB_VERSION "5.15.40")
 set(AKONADI_LIB_VERSION "5.15.40")
 set(INCIDENCEEDITOR_LIB_VERSION "5.15.40")
@@ -82,7 +81,7 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.15.40")
 set(KIMAP_LIB_VERSION "5.15.40")
 set(LIBKSIEVE_LIB_VERSION "5.15.40")
 set(KMAILTRANSPORT_LIB_VERSION "5.15.40")
-set(AKONADICONTACT_LIB_VERSION "5.15.40")
+set(AKONADICONTACT_LIB_VERSION "5.15.41")
 set(IMPORTWIZARD_LIB_VERSION "5.15.40")
 set(MAILIMPORTER_LIB_VERSION "5.15.40")
 set(KPIMPKPASS_LIB_VERSION "5.15.40")
@@ -95,7 +94,6 @@ find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED)
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
@@ -126,6 +124,9 @@ find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
 
+set(GRANTLEE_LIB_VERSION "5.2.0")
+find_package(Grantlee5 ${GRANTLEE_LIB_VERSION} CONFIG REQUIRED)
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

kaddressbook/importexportplugins/vcards/CMakeLists.txt

@@ -12,14 +12,13 @@ kcoreaddons_add_plugin(kaddressbook_importexportvcardplugin JSON kaddressbook_im
 target_link_libraries(kaddressbook_importexportvcardplugin
     KF5::KaddressbookImportExport
     KF5::PimCommon
-        KF5::I18n
-        KF5::XmlGui
-        KF5::Contacts
-        KF5::KaddressbookGrantlee
-        KF5::JobWidgets
-        KF5::AkonadiContact
-        kaddressbookimportexportlibprivate
-        Gpgmepp
-        QGpgme
+    KF5::I18n
+    KF5::XmlGui
+    KF5::Contacts
+    KF5::JobWidgets
+    KF5::AkonadiContact
+    kaddressbookimportexportlibprivate
+    Gpgmepp
+    QGpgme
     )
 

kaddressbook/importexportplugins/vcards/engine/vcardviewerdialog.cpp

@@ -11,7 +11,7 @@
 #include <KConfigGroup>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <KaddressbookGrantlee/GrantleeContactViewer>
+#include <Akonadi/Contact/GrantleeContactViewer>
 #include <QPushButton>
 #include <QDialogButtonBox>
 

kaddressbook/plugins/mergelib/CMakeLists.txt

@@ -31,7 +31,13 @@ generate_export_header(kaddressbookmergelibprivate BASE_NAME kaddressbookmergeli
 
 target_link_libraries(kaddressbookmergelibprivate
     PRIVATE
-    Qt5::Network KF5::I18n KF5::KaddressbookGrantlee KF5::Contacts KF5::AkonadiContact KF5::ConfigCore KF5::WidgetsAddons KF5::AkonadiWidgets
+    Qt5::Network
+    KF5::I18n
+    KF5::Contacts
+    KF5::AkonadiContact
+    KF5::ConfigCore
+    KF5::WidgetsAddons
+    KF5::AkonadiWidgets
     )
 
 set_target_properties(kaddressbookmergelibprivate

kaddressbook/plugins/mergelib/autotests/CMakeLists.txt

@@ -22,20 +22,20 @@ if (KDEPIM_RUN_AKONADI_TEST)
     set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
     set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
 
-    add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "../widgets/mergecontactinfowidget.cpp;${kaddressbookmergelibprivate_common_SRCS}" "KF5::AkonadiContact;KF5::KaddressbookGrantlee")
-    add_akonadi_isolated_test_advanced( mergecontactwidgettest.cpp "../widgets/mergecontactinfowidget.cpp;${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::KaddressbookGrantlee;KF5::Contacts;KF5::AkonadiContact;KF5::WidgetsAddons")
+    add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "../widgets/mergecontactinfowidget.cpp;${kaddressbookmergelibprivate_common_SRCS}" "KF5::AkonadiContact")
+    add_akonadi_isolated_test_advanced( mergecontactwidgettest.cpp "../widgets/mergecontactinfowidget.cpp;${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact;KF5::WidgetsAddons")
     add_akonadi_isolated_test_advanced( searchandmergecontactduplicatecontactdialogtest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts")
-    add_akonadi_isolated_test_advanced( searchduplicateresultwidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::KaddressbookGrantlee;KF5::Contacts;KF5::WidgetsAddons;KF5::AkonadiWidgets;KF5::AkonadiContact")
+    add_akonadi_isolated_test_advanced( searchduplicateresultwidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts;KF5::WidgetsAddons;KF5::AkonadiWidgets;KF5::AkonadiContact")
     add_akonadi_isolated_test_advanced( resultduplicatetreewidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts")
     add_akonadi_isolated_test_advanced( searchpotentialduplicatecontactjobtest.cpp "${kaddressbookmergelibprivate_common_SRCS};../job/searchpotentialduplicatecontactjob.cpp" "KF5::Contacts")
     add_akonadi_isolated_test_advanced( mergecontactselectinformationwidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts")
     add_akonadi_isolated_test_advanced( mergecontactselectlistwidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts")
 
-    add_akonadi_isolated_test_advanced( mergecontactselectinformationscrollareatest.cpp "${kaddressbookmergelibprivate_common_SRCS};../widgets/mergecontactinfowidget.cpp" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact;KF5::KaddressbookGrantlee")
+    add_akonadi_isolated_test_advanced( mergecontactselectinformationscrollareatest.cpp "${kaddressbookmergelibprivate_common_SRCS};../widgets/mergecontactinfowidget.cpp" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact")
 
     add_akonadi_isolated_test_advanced( mergecontactselectinformationtabwidgettest.cpp "${kaddressbookmergelibprivate_common_SRCS}" "kaddressbookmergelibprivate;KF5::Contacts")
 
-    add_akonadi_isolated_test_advanced(mergecontactsdialogtest.cpp "${kaddressbookmergelibprivate_common_SRCS};../manualmerge/mergecontactsdialog.cpp;../widgets/mergecontacterrorlabel.cpp;../widgets/mergecontactinfowidget.cpp" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact;KF5::KaddressbookGrantlee;KF5::I18n;KF5::WidgetsAddons")
+    add_akonadi_isolated_test_advanced(mergecontactsdialogtest.cpp "${kaddressbookmergelibprivate_common_SRCS};../manualmerge/mergecontactsdialog.cpp;../widgets/mergecontacterrorlabel.cpp;../widgets/mergecontactinfowidget.cpp" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact;KF5::I18n;KF5::WidgetsAddons")
     add_akonadi_isolated_test_advanced(mergecontactwidgetlisttest.cpp "${kaddressbookmergelibprivate_common_SRCS};../manualmerge/mergecontactwidgetlist.cpp;" "kaddressbookmergelibprivate;KF5::Contacts;KF5::AkonadiContact")
 
 endif()

kaddressbook/plugins/mergelib/autotests/searchduplicateresultwidgettest.cpp

@@ -8,7 +8,7 @@
 #include "../searchduplicate/searchduplicateresultwidget.h"
 #include "../searchduplicate/resultduplicatetreewidget.h"
 #include "../widgets/mergecontactloseinformationwarning.h"
-#include <KaddressbookGrantlee/GrantleeContactViewer>
+#include <Akonadi/Contact/GrantleeContactViewer>
 #include <QSplitter>
 #include <QLayout>
 #include <QLabel>

kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp

@@ -15,7 +15,7 @@
 #include <QSplitter>
 #include <QLabel>
 #include <QPushButton>
-#include <KaddressbookGrantlee/GrantleeContactViewer>
+#include <Akonadi/Contact/GrantleeContactViewer>
 #include <AkonadiWidgets/CollectionComboBox>
 
 namespace KABMergeContacts {

kaddressbook/plugins/mergelib/widgets/mergecontactinfowidget.cpp

@@ -5,7 +5,7 @@
 */
 #include "mergecontactinfowidget.h"
 
-#include <KaddressbookGrantlee/GrantleeContactViewer>
+#include <Akonadi/Contact/GrantleeContactViewer>
 
 #include <AkonadiCore/Item>