Git commit ad88dac43e851e07e29c76d768948be8ad7f14bf by Johannes Zarl-Zierl, on behalf of Luigi Toscano. Committed on 01/08/2016 at 16:07. Pushed by johanneszarl into branch 'master'.
Reenable documentation - use the macro and the native DTD for KDocTools - actually depend on KF5::DocTools M +1 -1 CMakeLists.txt M +1 -2 doc/CMakeLists.txt M +1 -1 doc/index.docbook http://commits.kde.org/kphotoalbum/ad88dac43e851e07e29c76d768948be8ad7f14bf diff --git a/CMakeLists.txt b/CMakeLists.txt index 0802991..c055ad9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include(FeatureSummary) find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network) find_package(Phonon4Qt5 REQUIRED) -find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO WidgetsAddons Config IconThemes KDELibs4Support Archive Parts) +find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools WidgetsAddons Config IconThemes KDELibs4Support Archive Parts) # enable exceptions: kde_enable_exceptions() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 28d6a77..8f599c6 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,3 @@ -# 2016-02-21 TODO ZaJ: change this to its KF5-equivalent: -#KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kphotoalbum) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kphotoalbum) # vi:expandtab:tabstop=4 shiftwidth=4: diff --git a/doc/index.docbook b/doc/index.docbook index d98805e..523c9cf 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>"> <!ENTITY kappname "&kphotoalbum;"> <!ENTITY package "extragear-graphics"> _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
