diff --git a/CMakeLists.txt b/CMakeLists.txt
index dba6a7de..76ae4e84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,190 +1,191 @@
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.12.40")
project(kdepim-addons VERSION ${PIM_VERSION})
if(POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif()
set(KF5_MIN_VERSION "5.60.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ ${ECM_MODULE_PATH})
+set(CMAKE_AUTORCC TRUE)
# Do NOT add quote
set(KDEPIM_DEV_VERSION alpha)
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
set(KDEPIMADDONS_VERSION_NUMBER ${PIM_VERSION})
set(KDEPIMADDONS_VERSION "${KDEPIMADDONS_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}")
set(KDEPIMADDONS_LIB_SOVERSION "5")
set(AKONADINOTES_LIB_VERSION "5.12.40")
set(QT_REQUIRED_VERSION "5.11.0")
include(ECMInstallIcons)
include(ECMSetupVersion)
include(ECMAddTests)
include(GenerateExportHeader)
include(ECMGenerateHeaders)
include(FeatureSummary)
include(CheckFunctionExists)
include(ECMGeneratePriFile)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." TRUE)
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
option(KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD "Build the kmail editor converter plugin." FALSE)
option(KMAIL_DKIM_CONFIGURE_DIALOG_BUILD "Build dkim-verify configure dialog (experimental)." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test)
find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Declarative ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5SyntaxHighlighting ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Parts ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.12.40")
set(GRAVATAR_LIB_VERSION "5.12.40")
set(PIMCOMMON_LIB_VERSION "5.12.40")
set(GRANTLEETHEME_LIB_VERSION "5.12.40")
set(CALENDARSUPPORT_LIB_VERSION "5.12.40")
set(EVENTVIEW_LIB_VERSION "5.12.40")
set(LIBKDEPIM_LIB_VERSION "5.12.40")
set(KDEPIM_APPS_LIB_VERSION "5.12.40")
set(LIBKLEO_LIB_VERSION "5.12.40")
set(AKONADI_LIB_VERSION "5.12.40")
set(INCIDENCEEDITOR_LIB_VERSION "5.12.40")
set(KTNEF_LIB_VERSION "5.12.40")
set(MESSAGELIB_LIB_VERSION "5.12.42")
set(AKONADICALENDAR_LIB_VERSION "5.12.40")
set(CALENDAR_UTILS_VERSION "5.12.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.12.41")
set(KIMAP_LIB_VERSION "5.12.40")
set(LIBKSIEVE_LIB_VERSION "5.12.40")
set(KMAILTRANSPORT_LIB_VERSION "5.12.40")
set(AKONADICONTACT_LIB_VERSION "5.12.40")
set(KCONTACTS_LIB_VERSION "5.12.40")
set(IMPORTWIZARD_LIB_VERSION "5.12.40")
set(MAILIMPORTER_LIB_VERSION "5.12.40")
set(KPIMPKPASS_LIB_VERSION "5.12.40")
set(KPIMITINERARY_LIB_VERSION "5.12.41")
set(KCALENDARCORE_LIB_VERSION "5.12.40")
set(KONTACTINTERFACE_LIB_VERSION "5.12.40")
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.12.40")
find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
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)
find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${KIDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5ContactEditor ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimImportWizard ${IMPORTWIZARD_LIB_VERSION} CONFIG)
find_package(KF5MailImporterAkonadi ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED)
set(CMAKE_CXX_STANDARD 14)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif(BUILD_TESTING)
if(KDEPIM_ENTERPRISE_BUILD)
set(KDEPIM_ENTERPRISE_BUILD true)
else()
set(KDEPIM_ENTERPRISE_BUILD false)
endif()
# Extra package
find_package(Gpgmepp 1.11.1 CONFIG)
set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "https://www.gnupg.org" TYPE REQUIRED)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DQT_NO_FOREACH)
option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
if(KDEPIMADDONS_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
set(QTCREATOR_TEMPLATE_INSTALL_DIR ${KDE_INSTALL_DATADIR}/qtcreator/templates CACHE PATH "Define qtcreator template install path (default is /usr/share/qtcreator/templates)")
find_package(Discount "2")
set_package_properties("discount" PROPERTIES
DESCRIPTION "A library that gives you formatting functions suitable for marking down entire documents or lines of text"
URL "https://www.pell.portland.or.us/~orc/Code/discount/"
TYPE RECOMMENDED
PURPOSE "Generate Markdown file.")
if(discount_FOUND)
if (${PC_LIBMARKDOWN_VERSION_STRING})
if (${PC_LIBMARKDOWN_VERSION_STRING} VERSION_GREATER "2.2.5")
set(DISCOUNT_HAS_HIGHLIGHTING_SUPPORT TRUE)
MESSAGE(STATUS "Discount ${PC_LIBMARKDOWN_VERSION_STRING}: has hightlighting support")
endif()
endif()
endif()
add_subdirectory(plugins)
add_subdirectory(korganizer)
add_subdirectory(kmail)
add_subdirectory(kaddressbook)
add_subdirectory(sieveeditor)
add_subdirectory(kmailtransport)
if(KPimImportWizard_FOUND)
add_subdirectory(akonadi-import-wizard)
endif()
install(FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt
index f108f8a0..22a21b19 100644
--- a/plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt
@@ -1,24 +1,24 @@
set(itinerary_plugin_srcs
itinerary_plugin.cpp
itinerarymemento.cpp
itineraryprocessor.cpp
itineraryrenderer.cpp
itineraryurlhandler.cpp
+ templates/templates.qrc
)
ecm_qt_declare_logging_category(itinerary_plugin_srcs HEADER itinerary_debug.h IDENTIFIER ITINERARY_LOG CATEGORY_NAME org.kde.pim.messageviewer.itinerary)
-qt5_add_resources(itinerary_plugin_srcs templates.qrc)
add_library(messageviewer_bodypartformatter_semantic MODULE ${itinerary_plugin_srcs})
target_compile_definitions(messageviewer_bodypartformatter_semantic PRIVATE -DTRANSLATION_DOMAIN=\"messageviewer_semantic_plugin\")
target_link_libraries(messageviewer_bodypartformatter_semantic
KF5::KontactInterface
KF5::MessageViewer
KF5::CalendarSupport
KF5::I18n
Grantlee5::Templates
Qt5::DBus
KF5::Prison
KPim::Itinerary
KPim::PkPass
)
install(TARGETS messageviewer_bodypartformatter_semantic DESTINATION ${KDE_INSTALL_PLUGINDIR}/messageviewer/bodypartformatter)
diff --git a/plugins/messageviewer/bodypartformatter/itinerary/templates.qrc b/plugins/messageviewer/bodypartformatter/itinerary/templates.qrc
deleted file mode 100644
index 4cc5badf..00000000
--- a/plugins/messageviewer/bodypartformatter/itinerary/templates.qrc
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- templates/itinerary.html
- templates/flightreservation.html
- templates/lodgingreservation.html
- templates/trainreservation.html
- templates/busreservation.html
- templates/event.html
- templates/actions.html
- templates/foodestablishmentreservation.html
- templates/rentalcarreservation.html
- templates/taxireservation.html
-
-
diff --git a/plugins/messageviewer/bodypartformatter/itinerary/templates/templates.qrc b/plugins/messageviewer/bodypartformatter/itinerary/templates/templates.qrc
new file mode 100644
index 00000000..ffc3d784
--- /dev/null
+++ b/plugins/messageviewer/bodypartformatter/itinerary/templates/templates.qrc
@@ -0,0 +1,14 @@
+
+
+ itinerary.html
+ flightreservation.html
+ lodgingreservation.html
+ trainreservation.html
+ busreservation.html
+ event.html
+ actions.html
+ foodestablishmentreservation.html
+ rentalcarreservation.html
+ taxireservation.html
+
+