[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd the mobi filter to the build.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-04-05 3:15:19
Message-ID: E1Yeb1r-0004Er-5v () scm ! kde ! org
[Download RAW message or body]

Git commit 6a473604b4da2d1ffc0f09d3d744091172d3eb6a by Inge Wallin.
Committed on 05/04/2015 at 03:14.
Pushed by ingwa into branch 'frameworks'.

Readd the mobi filter to the build.

M  +1    -1    CalligraProducts.cmake
M  +2    -4    filters/words/mobi/CMakeLists.txt
M  +6    -2    filters/words/mobi/exportmobi.cpp

http://commits.kde.org/calligra/6a473604b4da2d1ffc0f09d3d744091172d3eb6a

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 065235e..10a9095 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -172,7 +172,7 @@ calligra_define_product(FILTER_APPLIXWORD_TO_ODT "Appli=
xword to ODT filter"  REQ
 calligra_define_product(FILTER_ASCII_TO_WORDS "Words ASCII import filter" =
UNPORTED  REQUIRES PART_WORDS LIB_KOODF2)
 calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" REQUIRES=
 LIB_KOODFREADER LIB_CALLIGRA)
 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_MOBI "Mobi export filter" REQUIRES L=
IB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" REQU=
IRES 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)
diff --git a/filters/words/mobi/CMakeLists.txt b/filters/words/mobi/CMakeLi=
sts.txt
index 01f6c30..3437e86 100644
--- a/filters/words/mobi/CMakeLists.txt
+++ b/filters/words/mobi/CMakeLists.txt
@@ -14,12 +14,10 @@ set(odt2mobi_PART_SRCS
 =

 =

 add_library(calligra_filter_odt2mobi MODULE ${odt2mobi_PART_SRCS})
-
-
-target_link_libraries(calligra_filter_odt2mobi komain)
+target_link_libraries(calligra_filter_odt2mobi komain Qt5::Svg)
 =

 install(TARGETS calligra_filter_odt2mobi  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
-
+kcoreaddons_desktop_to_json(calligra_filter_odt2mobi calligra_filter_odt2m=
obi.desktop)
 =

 =

  ########### install files ###############
diff --git a/filters/words/mobi/exportmobi.cpp b/filters/words/mobi/exportm=
obi.cpp
index 8ef9f89..e080b3b 100644
--- a/filters/words/mobi/exportmobi.cpp
+++ b/filters/words/mobi/exportmobi.cpp
@@ -35,8 +35,12 @@
 =

 =

 =

-K_PLUGIN_FACTORY(ExportMobiFactory, registerPlugin<ExportMobi>();)
-K_EXPORT_PLUGIN(ExportMobiFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportMobiFactory, "calligra_filter_odt2mobi.js=
on",
+			   registerPlugin<ExportMobi>();)
+
+// Needed to instantiate the plugin factory.
+#include "exportmobi.moc"
+
 =

 ExportMobi::ExportMobi(QObject *parent, const QVariantList &) :
     KoFilter(parent)
[prev in list] [next in list] [prev in thread] [next in thread]