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

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd FILTER_ODT_TO_WIKI to the build.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-04-05 3:51:18
Message-ID: E1Yebag-00035q-N0 () scm ! kde ! org
[Download RAW message or body]

Git commit 627ae4ab75aa5b691ad806db77116b0827f4ad78 by Inge Wallin.
Committed on 05/04/2015 at 03:50.
Pushed by ingwa into branch 'frameworks'.

Readd FILTER_ODT_TO_WIKI to the build.

M  +1    -1    CalligraProducts.cmake
M  +2    -2    filters/words/wiki/export/CMakeLists.txt
M  +5    -2    filters/words/wiki/export/WikiExport.cpp

http://commits.kde.org/calligra/627ae4ab75aa5b691ad806db77116b0827f4ad78

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 5c8f317..9b56553 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -175,7 +175,7 @@ calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT f=
ilter" UNPORTED  REQUIRES
 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)
+calligra_define_product(FILTER_ODT_TO_WIKI "ODT Wiki export filter" REQUIR=
ES LIB_KOODFREADER LIB_KOODF2 LIB_CALLIGRA)
 =

 # Plan filters
 calligra_define_product(FILTER_MPXJ_IMPORT "MS Project import filter" UNPO=
RTED  REQUIRES APP_PLAN)
diff --git a/filters/words/wiki/export/CMakeLists.txt b/filters/words/wiki/=
export/CMakeLists.txt
index fc183b2..19767ee 100644
--- a/filters/words/wiki/export/CMakeLists.txt
+++ b/filters/words/wiki/export/CMakeLists.txt
@@ -11,6 +11,6 @@ set(odt2wiki_PART_SRCS
 )
 add_library(calligra_filter_odt2wiki MODULE ${odt2wiki_PART_SRCS})
 target_link_libraries(calligra_filter_odt2wiki koodfreader komain koodf2)
-install(TARGETS calligra_filter_odt2wiki DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

-install( FILES calligra_filter_odt2wiki.desktop DESTINATION ${SERVICES_INS=
TALL_DIR})
+install(TARGETS calligra_filter_odt2wiki DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
+kcoreaddons_desktop_to_json(calligra_filter_odt2wiki calligra_filter_odt2w=
iki.desktop)
diff --git a/filters/words/wiki/export/WikiExport.cpp b/filters/words/wiki/=
export/WikiExport.cpp
index 2bb2a10..337f683 100644
--- a/filters/words/wiki/export/WikiExport.cpp
+++ b/filters/words/wiki/export/WikiExport.cpp
@@ -41,8 +41,11 @@
 #include "OdfReaderWikiContext.h"
 =

 =

-K_PLUGIN_FACTORY(WikiExportFactory, registerPlugin<WikiExport>();)
-K_EXPORT_PLUGIN(WikiExportFactory("wordswikiexportng", "calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(WikiExportFactory, "calligra_filter_odt2wiki.js=
on",
+			   registerPlugin<WikiExport>();)
+
+// Needed to instantiate the plugin factory.
+#include "WikiExport.moc"
 =

 =

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