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

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd FILTER_KARBON_TO_SVG to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-04-09 22:42:30
Message-ID: E1YgL9a-0006MW-Ps () scm ! kde ! org
[Download RAW message or body]

Git commit 501e5dde3db0f2cc405ee58fa266ddb288a901e1 by Friedrich W. H. Koss=
ebau.
Committed on 09/04/2015 at 22:39.
Pushed by kossebau into branch 'frameworks'.

Readd FILTER_KARBON_TO_SVG to build

M  +1    -1    CalligraProducts.cmake
M  +1    -2    filters/karbon/svg/CMakeLists.txt
M  +2    -2    filters/karbon/svg/SvgExport.cpp

http://commits.kde.org/calligra/501e5dde3db0f2cc405ee58fa266ddb288a901e1

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index ff39a47..d9c93d0 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -186,7 +186,7 @@ calligra_define_product(FILTER_XFIG_TO_ODG "XFig to ODG=
 filter"  REQUIRES LIB_CA
 calligra_define_product(FILTER_PDF_TO_SVG "PDF to SVG filter"  REQUIRES LI=
B_CALLIGRA)
 calligra_define_product(FILTER_WPG_TO_SVG "WPG to SVG filter"  REQUIRES LI=
B_CALLIGRA)
 calligra_define_product(FILTER_KARBON_TO_IMAGE "Karbon image export filter=
" UNPORTED  REQUIRES APP_KARBON)
-calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter" UN=
PORTED  REQUIRES APP_KARBON)
+calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter"  R=
EQUIRES APP_KARBON)
 calligra_define_product(FILTER_SVG_TO_KARBON "Karbon SVG import filter" UN=
PORTED  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" RE=
QUIRES APP_KARBON)
 calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" REQUIRES LIB=
_KOVECTORIMAGE LIB_CALLIGRA)
diff --git a/filters/karbon/svg/CMakeLists.txt b/filters/karbon/svg/CMakeLi=
sts.txt
index 4c1e69c..b8e55a5 100644
--- a/filters/karbon/svg/CMakeLists.txt
+++ b/filters/karbon/svg/CMakeLists.txt
@@ -11,13 +11,12 @@ set(karbon2svg_PART_SRCS
 )
 =

 add_library(calligra_filter_karbon2svg MODULE ${karbon2svg_PART_SRCS})
+kcoreaddons_desktop_to_json(calligra_filter_karbon2svg calligra_filter_kar=
bon2svg.desktop)
 =

 target_link_libraries(calligra_filter_karbon2svg karbonui)
 =

 install(TARGETS calligra_filter_karbon2svg DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

-install( FILES  calligra_filter_karbon2svg.desktop  DESTINATION ${SERVICES=
_INSTALL_DIR}/calligra)
-
 endif()
 =

 =

diff --git a/filters/karbon/svg/SvgExport.cpp b/filters/karbon/svg/SvgExpor=
t.cpp
index 32abc7c..5face41 100644
--- a/filters/karbon/svg/SvgExport.cpp
+++ b/filters/karbon/svg/SvgExport.cpp
@@ -46,8 +46,8 @@
 =

 #include <QString>
 =

-K_PLUGIN_FACTORY(SvgExportFactory, registerPlugin<SvgExport>();)
-K_EXPORT_PLUGIN(SvgExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(SvgExportFactory, "calligra_filter_karbon2svg.j=
son",
+                           registerPlugin<SvgExport>();)
 =

 SvgExport::SvgExport(QObject*parent, const QVariantList&)
     : KoFilter(parent)

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