From kde-commits  Tue Mar 31 20:40:50 2015
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: Tue, 31 Mar 2015 20:40:50 +0000
To: kde-commits
Subject: [calligra/frameworks] /: Readd FILTER_KPR_TO_ODP to build
Message-Id: <E1Yd2xu-0007BK-Kn () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142783446630206

Git commit 46decc472eee0f85b75a21f8e5c6e1370679d6b9 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 20:28.
Pushed by kossebau into branch 'frameworks'.

Readd FILTER_KPR_TO_ODP to build

M  +1    -1    CalligraProducts.cmake
M  +2    -1    filters/stage/kpr2odf/CMakeLists.txt
M  +1    -2    filters/stage/kpr2odf/Filterkpr2odf.cpp

http://commits.kde.org/calligra/46decc472eee0f85b75a21f8e5c6e1370679d6b9

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index d5a38d6..94666ee 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -158,7 +158,7 @@ calligra_define_product(FILTER_WPG_TO_ODG "WPG to ODG f=
ilter" UNPORTED  REQUIRES
 =

 # Stage filters
 calligra_define_product(FILTER_KEY_TO_ODP "Apple Keynote to ODP filter" UN=
PORTED  REQUIRES LIB_CALLIGRA)
-calligra_define_product(FILTER_KPR_TO_ODP "KPresenter to ODP filter" UNPOR=
TED  REQUIRES LIB_CALLIGRA)
+calligra_define_product(FILTER_KPR_TO_ODP "KPresenter to ODP filter"  REQU=
IRES LIB_CALLIGRA)
 calligra_define_product(FILTER_PPT_TO_ODP "PPT to OPD filter" UNPORTED  RE=
QUIRES LIB_MSO LIB_CALLIGRA)
 calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter" UNPORTED  =
REQUIRES LIB_KOMSOOXML LIB_KOODF2 LIB_CALLIGRA)
 =

diff --git a/filters/stage/kpr2odf/CMakeLists.txt b/filters/stage/kpr2odf/C=
MakeLists.txt
index 5b71574..1bb463b 100644
--- a/filters/stage/kpr2odf/CMakeLists.txt
+++ b/filters/stage/kpr2odf/CMakeLists.txt
@@ -7,10 +7,11 @@ set(kpr2odp_PART_SRCS Filterkpr2odf.cpp )
 =

 add_library(calligra_filter_kpr2odp MODULE ${kpr2odp_PART_SRCS})
 =

+kcoreaddons_desktop_to_json(calligra_filter_kpr2odp calligra_filter_kpr2od=
p.desktop)
+
 target_link_libraries(calligra_filter_kpr2odp komain)
 =

 install(TARGETS calligra_filter_kpr2odp DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
-install( FILES  calligra_filter_kpr2odp.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
     install( FILES  stage_kpr_thumbnail.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR})
diff --git a/filters/stage/kpr2odf/Filterkpr2odf.cpp b/filters/stage/kpr2od=
f/Filterkpr2odf.cpp
index 58653ab..1800acd 100644
--- a/filters/stage/kpr2odf/Filterkpr2odf.cpp
+++ b/filters/stage/kpr2odf/Filterkpr2odf.cpp
@@ -55,8 +55,7 @@ using std::cos;
 #define M_PI 3.14159265358979323846
 #endif
 =

-K_PLUGIN_FACTORY(Filterkpr2odfFactory, registerPlugin<Filterkpr2odf>();)
-K_EXPORT_PLUGIN(Filterkpr2odfFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(Filterkpr2odfFactory, "calligra_filter_kpr2odp.=
json", registerPlugin<Filterkpr2odf>();)
 =

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