Git commit e2e7935f5713226ff2c1d8cc7d6c9a1a0758d85a by Inge Wallin.
Committed on 30/03/2015 at 03:31.
Pushed by ingwa into branch 'frameworks'.

Readd the Odt2html filter to the build.

M  +1    -1    CalligraProducts.cmake
M  +3    -2    filters/words/epub/CMakeLists.txt
M  +5    -2    filters/words/epub/exporthtml.cpp

http://commits.kde.org/calligra/e2e7935f5713226ff2c1d8cc7d6c9a1a0758d85a

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 1bba8db..bd79e9b 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -174,7 +174,7 @@ calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASC=
II filter" REQUIRES LIB_K
 calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT filter" UNPORTED  RE=
QUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_MOBI "Mobi export filter" UNPORTED  =
REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" UNPO=
RTED  REQUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
-calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" UNPORT=
ED  REQUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
+calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" REQUIR=
ES LIB_KOVECTORIMAGE LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_WIKI "ODT Wiki export filter" UNPORT=
ED  REQUIRES LIB_KOODFREADER LIB_KOODF2 LIB_CALLIGRA)
 =

 # Plan filters
diff --git a/filters/words/epub/CMakeLists.txt b/filters/words/epub/CMakeLi=
sts.txt
index c3e2447..c8c1635 100644
--- a/filters/words/epub/CMakeLists.txt
+++ b/filters/words/epub/CMakeLists.txt
@@ -39,10 +39,11 @@ set(odt2html_PART_SRCS
 =

 add_library(calligra_filter_odt2html MODULE ${odt2html_PART_SRCS})
 =

-target_link_libraries(calligra_filter_odt2html kovectorimage komain)
+target_link_libraries(calligra_filter_odt2html kovectorimage komain Qt5::S=
vg)
 =

 install(TARGETS calligra_filter_odt2html  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
-install( FILES  calligra_filter_odt2html.desktop  DESTINATION ${SERVICES_I=
NSTALL_DIR}/calligra)
+kcoreaddons_desktop_to_json(calligra_filter_odt2html calligra_filter_odt2h=
tml.desktop)
+install( PROGRAMS  calligra_filter_odt2html.desktop  DESTINATION ${XDG_APP=
S_INSTALL_DIR})
 =

 endif()
 =

diff --git a/filters/words/epub/exporthtml.cpp b/filters/words/epub/exporth=
tml.cpp
index 83a0133..fc77e1f 100644
--- a/filters/words/epub/exporthtml.cpp
+++ b/filters/words/epub/exporthtml.cpp
@@ -52,8 +52,11 @@
 #include "SvmPainterBackend.h"
 =

 =

-K_PLUGIN_FACTORY(ExportHtmlFactory, registerPlugin<ExportHtml>();)
-K_EXPORT_PLUGIN(ExportHtmlFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportHtmlFactory, "calligra_filter_odt2html.js=
on",
+			   registerPlugin<ExportHtml>();)
+
+// Needed to instantiate the plugin factory.
+#include "exporthtml.moc"
 =

 =

 ExportHtml::ExportHtml(QObject *parent, const QVariantList&)