[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/frameworks] /: Readd Krita to build
From: Sven Langkamp <sven.langkamp () gmail ! com>
Date: 2015-04-01 19:55:45
Message-ID: E1YdOjp-0004da-Bx () scm ! kde ! org
[Download RAW message or body]
Git commit ba04119368655a981176d613b6144701ffe73e11 by Sven Langkamp.
Committed on 01/04/2015 at 19:46.
Pushed by langkamp into branch 'frameworks'.
Readd Krita to build
M +1 -1 CalligraProducts.cmake
M +2 -0 krita/plugins/formats/bmp/CMakeLists.txt
M +1 -2 krita/plugins/formats/bmp/kis_bmp_export.cpp
M +1 -2 krita/plugins/formats/bmp/kis_bmp_import.cpp
M +2 -2 krita/plugins/formats/exr/CMakeLists.txt
M +1 -2 krita/plugins/formats/exr/exr_export.cc
M +1 -2 krita/plugins/formats/exr/exr_import.cc
M +2 -0 krita/plugins/formats/heightmap/CMakeLists.txt
M +1 -2 krita/plugins/formats/heightmap/kis_heightmap_export.cpp
M +1 -2 krita/plugins/formats/heightmap/kis_heightmap_import.cpp
A +- -- krita/plugins/formats/png/.kis_png_export.cc.kate-swp
M +2 -2 krita/plugins/formats/png/CMakeLists.txt
M +1 -2 krita/plugins/formats/png/kis_png_export.cc
M +1 -2 krita/plugins/formats/png/kis_png_import.cc
M +2 -0 krita/plugins/formats/ppm/CMakeLists.txt
M +1 -2 krita/plugins/formats/ppm/kis_ppm_export.cpp
M +1 -2 krita/plugins/formats/ppm/kis_ppm_import.cpp
http://commits.kde.org/calligra/ba04119368655a981176d613b6144701ffe73e11
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 766203e..cb1ccf6 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -92,7 +92,7 @@ calligra_define_product(APP_STAGE "Stage app (for Desktop=
)" REQUIRES PART_STAGE
calligra_define_product(APP_SHEETS "Sheets app (for Desktop)" UNPORTED RE=
QUIRES PART_SHEETS)
calligra_define_product(APP_AUTHOR "Author app (for Desktop)" UNPORTED RE=
QUIRES PART_WORDS)
calligra_define_product(APP_KARBON "Karbon app (for Desktop)" REQUIRES LI=
B_CALLIGRA)
-calligra_define_product(APP_KRITA "Krita app (for Desktop)" UNPORTED REQUI=
RES LIB_CALLIGRA)
+calligra_define_product(APP_KRITA "Krita app (for Desktop)" REQUIRES LIB_C=
ALLIGRA)
calligra_define_product(APP_KEXI "Kexi app (for Desktop)" UNPORTED REQUIR=
ES LIB_CALLIGRA)
calligra_define_product(APP_FLOW "Flow app (for Desktop)" UNPORTED REQUIR=
ES LIB_CALLIGRA LIB_KOPAGEAPP)
calligra_define_product(APP_PLAN "Plan app (for Desktop)" UNPORTED REQUIR=
ES LIB_CALLIGRA)
diff --git a/krita/plugins/formats/bmp/CMakeLists.txt b/krita/plugins/forma=
ts/bmp/CMakeLists.txt
index 7a1b607..d4e3a5f 100644
--- a/krita/plugins/formats/bmp/CMakeLists.txt
+++ b/krita/plugins/formats/bmp/CMakeLists.txt
@@ -5,6 +5,7 @@ set(kritabmpexport_PART_SRCS
ki18n_wrap_ui(kritabmpexport_PART_SRCS )
=
add_library(kritabmpexport MODULE ${kritabmpexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritabmpexport krita_bmp_export.desktop)
=
target_link_libraries(kritabmpexport kritaui)
=
@@ -18,6 +19,7 @@ set(kritabmpimport_PART_SRCS
ki18n_wrap_ui(kritabmpimport_PART_SRCS )
=
add_library(kritabmpimport MODULE ${kritabmpimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritabmpimport krita_bmp_import.desktop)
=
target_link_libraries(kritabmpimport kritaui)
=
diff --git a/krita/plugins/formats/bmp/kis_bmp_export.cpp b/krita/plugins/f=
ormats/bmp/kis_bmp_export.cpp
index aa617f9..1dee446 100644
--- a/krita/plugins/formats/bmp/kis_bmp_export.cpp
+++ b/krita/plugins/formats/bmp/kis_bmp_export.cpp
@@ -32,8 +32,7 @@
#include <kis_image.h>
#include <kis_paint_layer.h>
=
-K_PLUGIN_FACTORY(KisBMPExportFactory, registerPlugin<KisBMPExport>();)
-K_EXPORT_PLUGIN(KisBMPExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(KisBMPExportFactory, "krita_bmp_export.json", r=
egisterPlugin<KisBMPExport>();)
=
KisBMPExport::KisBMPExport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
diff --git a/krita/plugins/formats/bmp/kis_bmp_import.cpp b/krita/plugins/f=
ormats/bmp/kis_bmp_import.cpp
index be6d2fc..2cebc42 100644
--- a/krita/plugins/formats/bmp/kis_bmp_import.cpp
+++ b/krita/plugins/formats/bmp/kis_bmp_import.cpp
@@ -41,8 +41,7 @@
#include <kis_group_layer.h>
=
=
-K_PLUGIN_FACTORY(KisBMPImportFactory, registerPlugin<KisBMPImport>();)
-K_EXPORT_PLUGIN(KisBMPImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(KisBMPImportFactory, "krita_bmp_import.json", r=
egisterPlugin<KisBMPImport>();)
=
KisBMPImport::KisBMPImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
diff --git a/krita/plugins/formats/exr/CMakeLists.txt b/krita/plugins/forma=
ts/exr/CMakeLists.txt
index a1057ce..461c587 100644
--- a/krita/plugins/formats/exr/CMakeLists.txt
+++ b/krita/plugins/formats/exr/CMakeLists.txt
@@ -16,7 +16,7 @@ set(kritaexrimport_PART_SRCS
)
=
add_library(kritaexrimport MODULE ${kritaexrimport_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaexrimport krita_exr_import.desktop)
=
=
target_link_libraries(kritaexrimport kritaui ${OPENEXR_LIBRARIES} )
@@ -33,7 +33,7 @@ set(kritaexrexport_PART_SRCS
ki18n_wrap_ui(kritaexrexport_PART_SRCS exr_export_widget.ui )
=
add_library(kritaexrexport MODULE ${kritaexrexport_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaexrexport krita_exr_export.desktop)
=
target_link_libraries(kritaexrexport kritaui ${OPENEXR_LIBRARIES} )
=
diff --git a/krita/plugins/formats/exr/exr_export.cc b/krita/plugins/format=
s/exr/exr_export.cc
index 4435710..e1c35f6 100644
--- a/krita/plugins/formats/exr/exr_export.cc
+++ b/krita/plugins/formats/exr/exr_export.cc
@@ -44,8 +44,7 @@
=
class KisExternalLayer;
=
-K_PLUGIN_FACTORY(ExportFactory, registerPlugin<exrExport>();)
-K_EXPORT_PLUGIN(ExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportFactory, "krita_exr_export.json", registe=
rPlugin<exrExport>();)
=
exrExport::exrExport(QObject *parent, const QVariantList &) : KisImportExp=
ortFilter(parent)
{
diff --git a/krita/plugins/formats/exr/exr_import.cc b/krita/plugins/format=
s/exr/exr_import.cc
index cb57ad1..9f14581 100644
--- a/krita/plugins/formats/exr/exr_import.cc
+++ b/krita/plugins/formats/exr/exr_import.cc
@@ -30,8 +30,7 @@
=
#include "exr_converter.h"
=
-K_PLUGIN_FACTORY(ImportFactory, registerPlugin<exrImport>();)
-K_EXPORT_PLUGIN(ImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ImportFactory, "krita_exr_import.json", registe=
rPlugin<exrImport>();)
=
exrImport::exrImport(QObject *parent, const QVariantList &) : KisImportExp=
ortFilter(parent)
{
diff --git a/krita/plugins/formats/heightmap/CMakeLists.txt b/krita/plugins=
/formats/heightmap/CMakeLists.txt
index 0606414..86fd250 100644
--- a/krita/plugins/formats/heightmap/CMakeLists.txt
+++ b/krita/plugins/formats/heightmap/CMakeLists.txt
@@ -7,6 +7,7 @@ set(kritaheightmapimport_PART_SRCS
ki18n_wrap_ui(kritaheightmapimport_PART_SRCS kis_wdg_options_heightmap.ui )
=
add_library(kritaheightmapimport MODULE ${kritaheightmapimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaheightmapimport krita_heightmap_import.de=
sktop)
=
target_link_libraries(kritaheightmapimport kritaui )
=
@@ -21,6 +22,7 @@ set(kritaheightmapexport_PART_SRCS
ki18n_wrap_ui(kritaheightmapexport_PART_SRCS kis_wdg_options_heightmap.ui )
=
add_library(kritaheightmapexport MODULE ${kritaheightmapexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaheightmapimport krita_heightmap_export.de=
sktop)
=
target_link_libraries(kritaheightmapexport kritaui )
=
diff --git a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp b/kri=
ta/plugins/formats/heightmap/kis_heightmap_export.cpp
index b3ffed2..94df491 100644
--- a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp
+++ b/krita/plugins/formats/heightmap/kis_heightmap_export.cpp
@@ -46,8 +46,7 @@
=
#include "ui_kis_wdg_options_heightmap.h"
=
-K_PLUGIN_FACTORY(KisHeightMapExportFactory, registerPlugin<KisHeightMapExp=
ort>();)
-K_EXPORT_PLUGIN(KisHeightMapExportFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisHeightMapExportFactory, "krita_heightmap_exp=
ort.json", registerPlugin<KisHeightMapExport>();)
=
KisHeightMapExport::KisHeightMapExport(QObject *parent, const QVariantList=
&) : KisImportExportFilter(parent)
{
diff --git a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp b/kri=
ta/plugins/formats/heightmap/kis_heightmap_import.cpp
index 584a5b5..b99b383 100644
--- a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp
+++ b/krita/plugins/formats/heightmap/kis_heightmap_import.cpp
@@ -50,8 +50,7 @@
=
#include "ui_kis_wdg_options_heightmap.h"
=
-K_PLUGIN_FACTORY(HeightMapImportFactory, registerPlugin<KisHeightMapImport=
>();)
-K_EXPORT_PLUGIN(HeightMapImportFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(HeightMapImportFactory, "krita_heightmap_import=
.json", registerPlugin<KisHeightMapImport>();)
=
KisHeightMapImport::KisHeightMapImport(QObject *parent, const QVariantList=
&) : KisImportExportFilter(parent)
{
diff --git a/krita/plugins/formats/png/.kis_png_export.cc.kate-swp b/krita/=
plugins/formats/png/.kis_png_export.cc.kate-swp
new file mode 100644
index 0000000..8276f5a
Binary files /dev/null and b/krita/plugins/formats/png/.kis_png_export.cc.k=
ate-swp differ
diff --git a/krita/plugins/formats/png/CMakeLists.txt b/krita/plugins/forma=
ts/png/CMakeLists.txt
index e58c00e..8bb8966 100644
--- a/krita/plugins/formats/png/CMakeLists.txt
+++ b/krita/plugins/formats/png/CMakeLists.txt
@@ -7,7 +7,7 @@ set(kritapngimport_PART_SRCS
)
=
add_library(kritapngimport MODULE ${kritapngimport_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritapngimport krita_png_import.desktop)
=
=
include_directories(${PNG_INCLUDE_DIR})
@@ -26,7 +26,7 @@ set(kritapngexport_PART_SRCS
ki18n_wrap_ui(kritapngexport_PART_SRCS kis_wdg_options_png.ui )
=
add_library(kritapngexport MODULE ${kritapngexport_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritapngexport krita_png_export.desktop)
=
=
target_link_libraries(kritapngexport kritaui ${PNG_LIBRARIES})
diff --git a/krita/plugins/formats/png/kis_png_export.cc b/krita/plugins/fo=
rmats/png/kis_png_export.cc
index 0c4b231..6eb6d64 100644
--- a/krita/plugins/formats/png/kis_png_export.cc
+++ b/krita/plugins/formats/png/kis_png_export.cc
@@ -46,8 +46,7 @@
#include "kis_png_converter.h"
#include <kis_iterator_ng.h>
=
-K_PLUGIN_FACTORY(KisPNGExportFactory, registerPlugin<KisPNGExport>();)
-K_EXPORT_PLUGIN(KisPNGExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY(KisPNGExportFactory, "krita_png_export.json", registerPlu=
gin<KisPNGExport>();)
=
KisPNGExport::KisPNGExport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
diff --git a/krita/plugins/formats/png/kis_png_import.cc b/krita/plugins/fo=
rmats/png/kis_png_import.cc
index 796f9dd..0b81921 100644
--- a/krita/plugins/formats/png/kis_png_import.cc
+++ b/krita/plugins/formats/png/kis_png_import.cc
@@ -31,8 +31,7 @@
=
#include "kis_png_converter.h"
=
-K_PLUGIN_FACTORY(PNGImportFactory, registerPlugin<KisPNGImport>();)
-K_EXPORT_PLUGIN(PNGImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(PNGImportFactory, "krita_png_import.json", regi=
sterPlugin<KisPNGImport>();)
=
KisPNGImport::KisPNGImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
diff --git a/krita/plugins/formats/ppm/CMakeLists.txt b/krita/plugins/forma=
ts/ppm/CMakeLists.txt
index 5bf7d16..0ba456e 100644
--- a/krita/plugins/formats/ppm/CMakeLists.txt
+++ b/krita/plugins/formats/ppm/CMakeLists.txt
@@ -7,6 +7,7 @@ set(kritappmimport_PART_SRCS
)
=
add_library(kritappmimport MODULE ${kritappmimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritappmimport krita_ppm_import.desktop)
=
target_link_libraries(kritappmimport kritaui )
=
@@ -21,6 +22,7 @@ set(kritappmexport_PART_SRCS
ki18n_wrap_ui(kritappmexport_PART_SRCS kis_wdg_options_ppm.ui )
=
add_library(kritappmexport MODULE ${kritappmexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritappmexport krita_ppm_export.desktop)
=
target_link_libraries(kritappmexport kritaui )
=
diff --git a/krita/plugins/formats/ppm/kis_ppm_export.cpp b/krita/plugins/f=
ormats/ppm/kis_ppm_export.cpp
index 027f6b7..1e5839c 100644
--- a/krita/plugins/formats/ppm/kis_ppm_export.cpp
+++ b/krita/plugins/formats/ppm/kis_ppm_export.cpp
@@ -44,8 +44,7 @@
#include <QApplication>
=
=
-K_PLUGIN_FACTORY(KisPPMExportFactory, registerPlugin<KisPPMExport>();)
-K_EXPORT_PLUGIN(KisPPMExportFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisPPMExportFactory, "krita_ppm_export.json", r=
egisterPlugin<KisPPMExport>();)
=
KisPPMExport::KisPPMExport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
diff --git a/krita/plugins/formats/ppm/kis_ppm_import.cpp b/krita/plugins/f=
ormats/ppm/kis_ppm_import.cpp
index 5a4c3e0..c96b4e2 100644
--- a/krita/plugins/formats/ppm/kis_ppm_import.cpp
+++ b/krita/plugins/formats/ppm/kis_ppm_import.cpp
@@ -45,8 +45,7 @@
#include <KoColorModelStandardIds.h>
#include "kis_iterator_ng.h"
=
-K_PLUGIN_FACTORY(PPMImportFactory, registerPlugin<KisPPMImport>();)
-K_EXPORT_PLUGIN(PPMImportFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(PPMImportFactory, "krita_ppm_import.json", regi=
sterPlugin<KisPPMImport>();)
=
KisPPMImport::KisPPMImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic