Git commit 55dc4e749230a90e4d40a36715f7ab49b7551187 by Ralf Habacker. Committed on 09/06/2015 at 08:21. Pushed by habacker into branch 'master'.
Revert "Fix KF5 doc build issue caused by using wrong DTD file and version." This reverts commit e65d423a5ac23b264c21b99526c6bf7ec7877c1b. M +0 -8 doc/CMakeLists.txt R +2 -2 doc/index.docbook [from: doc/index.docbook.cmake - 095% similarity] http://commits.kde.org/umbrello/55dc4e749230a90e4d40a36715f7ab49b7551187 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 8b4ad91..891c030 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,10 +1,2 @@ ########### install files ############### -if(BUILD_KF5) - set(DTD_FILE dtd/kdedb45x.dtd) - set(DTD_VERSION V4.5) -else() - set(DTD_FILE dtd/kdex.dtd) - set(DTD_VERSION V4.2) -endif() -configure_file(index.docbook.cmake ${CMAKE_CURRENT_SOURCE_DIR}/index.docbook) kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR umbrello) diff --git a/doc/index.docbook.cmake b/doc/index.docbook similarity index 95% rename from doc/index.docbook.cmake rename to doc/index.docbook index 2153ecb..3a260e7 100644 --- a/doc/index.docbook.cmake +++ b/doc/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML @DTD_VERSION at -Based Variant V1.1//EN" - "@DTD_FILE@" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" + "dtd/kdex.dtd" [ <!ENTITY umbrello "<application>Umbrello &UML; Modeller</application>"> <!ENTITY kappname "&umbrello;"> <!ENTITY packagename "kdesdk">