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

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd FILTER_KARBON1X_TO_KARBON to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-04-02 1:06:34
Message-ID: E1YdTac-0002vj-TH () scm ! kde ! org
[Download RAW message or body]

Git commit e9fdf821bf51e9a6ae4ebf9ae9292dcca1b6895b by Friedrich W. H. Koss=
ebau.
Committed on 02/04/2015 at 00:10.
Pushed by kossebau into branch 'frameworks'.

Readd FILTER_KARBON1X_TO_KARBON to build

M  +1    -1    CalligraProducts.cmake
M  +1    -2    filters/karbon/karbon1.x/CMakeLists.txt
M  +4    -2    filters/karbon/karbon1.x/Karbon1xImport.cpp

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

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 82441ac..30e3678 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -190,7 +190,7 @@ calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SV=
G export filter" UNPORTED
 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" UN=
PORTED  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" UNPORTED  RE=
QUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
-calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filte=
r" UNPORTED  REQUIRES APP_KARBON)
+calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filte=
r"  REQUIRES APP_KARBON)
 =

 # meta apps
 calligra_define_product(APP_ACTIVE "Calligra Active app" UNPORTED  REQUIRE=
S PART_SHEETS PART_STAGE PART_WORDS)
diff --git a/filters/karbon/karbon1.x/CMakeLists.txt b/filters/karbon/karbo=
n1.x/CMakeLists.txt
index 0f9b6a0..726ccbd 100644
--- a/filters/karbon/karbon1.x/CMakeLists.txt
+++ b/filters/karbon/karbon1.x/CMakeLists.txt
@@ -10,6 +10,7 @@ set(karbon1x2karbon_PART_SRCS Karbon1xImport.cpp)
 =

 =

 add_library(calligra_filter_karbon1x2karbon MODULE ${karbon1x2karbon_PART_=
SRCS})
+kcoreaddons_desktop_to_json(calligra_filter_karbon1x2karbon calligra_filte=
r_karbon1x2karbon.desktop)
 =

 target_link_libraries(calligra_filter_karbon1x2karbon karboncommon)
 =

@@ -17,8 +18,6 @@ install(TARGETS calligra_filter_karbon1x2karbon DESTINATI=
ON ${CALLIGRA_PLUGIN_IN
 =

 ########### install files ###############
 =

-install( FILES calligra_filter_karbon1x2karbon.desktop DESTINATION ${SERVI=
CES_INSTALL_DIR}/calligra)
-
 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
     install( FILES karbon_karbon1x_thumbnail.desktop DESTINATION ${SERVICE=
S_INSTALL_DIR})
 endif()
diff --git a/filters/karbon/karbon1.x/Karbon1xImport.cpp b/filters/karbon/k=
arbon1.x/Karbon1xImport.cpp
index 2f539df..b8dd8dd 100644
--- a/filters/karbon/karbon1.x/Karbon1xImport.cpp
+++ b/filters/karbon/karbon1.x/Karbon1xImport.cpp
@@ -38,8 +38,8 @@
 =

 #include <math.h>
 =

-K_PLUGIN_FACTORY(KarbonImportFactory, registerPlugin<KarbonImport>();)
-K_EXPORT_PLUGIN(KarbonImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(KarbonImportFactory, "calligra_filter_karbon1x2=
karbon.json",
+                           registerPlugin<KarbonImport>();)
 =

 KarbonImport::KarbonImport(QObject*parent, const QVariantList&)
     : KoFilter(parent), m_svgWriter(0)
@@ -1274,3 +1274,5 @@ QString KarbonImport::makeUnique(const QString &id)
 =

     return m_lastId;
 }
+
+#include "Karbon1xImport.moc"

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