Commit 59957444 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Port to KF5Grantlee

parent c2976200
Pipeline #85625 failed with stage
in 1 minute and 18 seconds
......@@ -60,7 +60,6 @@ set(AKONADI_SEARCH_VERSION "5.18.40")
set(QT_REQUIRED_VERSION "5.15.2")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network PrintSupport Test Widgets Xml)
find_package(Qt5X11Extras NO_MODULE)
find_package(Grantlee5 "5.2" CONFIG REQUIRED)
# Find KF5 package
find_package(KF5Completion ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5Config ${KF5_MIN_VERSION} REQUIRED)
......@@ -81,6 +80,7 @@ find_package(KF5TextWidgets ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5WindowSystem ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Grantlee ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_MIN_VERSION})
set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
"Tools to generate documentation"
......
......@@ -54,10 +54,22 @@ generate_export_header(knotesprivate BASE_NAME knotes)
target_link_libraries(knotesprivate
PUBLIC
KF5::IconThemes
KF5::IconThemes
PRIVATE
KF5::PimCommon
KF5::KCMUtils Grantlee5::Templates KF5::NewStuff KF5::WindowSystem Qt::PrintSupport KF5::TextWidgets KF5::I18n notesharedprivate KF5::AkonadiSearchPIM KF5::AkonadiNotes KF5::PimTextEdit KF5::AkonadiWidgets KF5::GrantleeTheme
notesharedprivate
KF5::AkonadiSearchPIM
KF5::AkonadiNotes
KF5::PimTextEdit
KF5::AkonadiWidgets
KF5::GrantleeTheme
KF5::Grantlee
KF5::PimCommon
KF5::KCMUtils
KF5::NewStuff
KF5::WindowSystem
KF5::TextWidgets
KF5::I18n
Qt::PrintSupport
)
set_target_properties(knotesprivate
......
......@@ -6,5 +6,14 @@ set( knotes_knotesgrantleeprint_source knotesgrantleeprinttest.cpp )
add_executable( knotesgrantleeprinttest ${knotes_knotesgrantleeprint_source})
add_test(NAME knotesgrantleeprinttest COMMAND knotesgrantleeprinttest)
ecm_mark_as_test(knotesgrantleeprinttest)
target_link_libraries( knotesgrantleeprinttest Qt::Test Qt::Gui KF5::AkonadiCore knotesprivate KF5::Mime KF5::AkonadiNotes Grantlee5::Templates KF5::GrantleeTheme)
target_link_libraries( knotesgrantleeprinttest
knotesprivate
KF5::AkonadiNotes
KF5::AkonadiCore
KF5::GrantleeTheme
KF5::Grantlee
KF5::Mime
Qt::Test
Qt::Gui
)
......@@ -21,10 +21,6 @@
#include "knotes_debug.h"
#include <KLocalizedString>
#include <grantlee/context.h>
#include <grantlee/engine.h>
#include <grantlee/templateloader.h>
KNotePrinter::KNotePrinter(QObject *parent)
: QObject(parent)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment