From kde-commits Tue Mar 31 23:53:59 2015 From: Sven Langkamp Date: Tue, 31 Mar 2015 23:53:59 +0000 To: kde-commits Subject: [calligra/frameworks] krita/plugins: fix building of fileformats and filters Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142784605001179 Git commit 103a655353c6886f184cdb4311dd3394ee664842 by Sven Langkamp. Committed on 31/03/2015 at 23:53. Pushed by langkamp into branch 'frameworks'. fix building of fileformats and filters M +3 -3 krita/plugins/CMakeLists.txt M +2 -2 krita/plugins/extensions/CMakeLists.txt M +1 -0 krita/plugins/extensions/gmic/CMakeLists.txt M +1 -2 krita/plugins/extensions/gmic/kis_gmic_plugin.cpp M +1 -1 krita/plugins/extensions/imagesize/CMakeLists.txt M +10 -9 krita/plugins/extensions/imagesize/dlg_canvassize.cc M +1 -2 krita/plugins/extensions/imagesize/imagesize.cc M +1 -1 krita/plugins/extensions/offsetimage/offsetimage.cpp M +3 -0 krita/plugins/filters/blur/blur.cpp M +2 -0 krita/plugins/filters/colors/colors.cpp M +2 -0 krita/plugins/filters/colorsfilters/colorsfilters.cpp M +2 -0 krita/plugins/filters/convolutionfilters/convolutionfilters.= cpp M +2 -0 krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp M +2 -0 krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.= cpp M +1 -0 krita/plugins/filters/example/example.cpp M +2 -0 krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp M +1 -0 krita/plugins/filters/imageenhancement/imageenhancement.cpp M +2 -0 krita/plugins/filters/indexcolors/indexcolors.cpp M +2 -0 krita/plugins/filters/levelfilter/levelfilter.cpp M +2 -0 krita/plugins/filters/noisefilter/noisefilter.cpp M +1 -0 krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plu= gin.cpp M +3 -0 krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plu= gin.cpp M +2 -0 krita/plugins/filters/posterize/posterize.cpp M +2 -0 krita/plugins/filters/raindropsfilter/kis_raindrops_filter_p= lugin.cpp M +2 -0 krita/plugins/filters/randompickfilter/randompickfilter.cpp M +1 -0 krita/plugins/filters/roundcorners/kis_round_corners_filter_= plugin.cpp M +1 -0 krita/plugins/filters/smalltilesfilter/kis_small_tiles_filte= r_plugin.cpp M +1 -0 krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp M +1 -1 krita/plugins/filters/unsharp/tests/CMakeLists.txt M +2 -0 krita/plugins/filters/unsharp/unsharp.cpp M +2 -0 krita/plugins/filters/wavefilter/wavefilter.cpp M +2 -0 krita/plugins/formats/heightmap/kis_heightmap_export.cpp M +3 -0 krita/plugins/formats/heightmap/kis_heightmap_import.cpp M +1 -1 krita/plugins/formats/odg/kis_odg_import.cc M +2 -0 krita/plugins/formats/ppm/kis_ppm_export.cpp M +3 -0 krita/plugins/formats/ppm/kis_ppm_import.cpp M +1 -1 krita/plugins/formats/ppm/tests/CMakeLists.txt M +1 -0 krita/plugins/formats/psd/psd_export.cc M +1 -0 krita/plugins/formats/psd/psd_import.cc M +1 -0 krita/plugins/formats/psd/psd_loader.h M +1 -0 krita/plugins/formats/psd/psd_saver.h M +1 -0 krita/plugins/formats/qml/qml_converter.h M +1 -0 krita/plugins/formats/tga/kis_tga_export.cpp M +1 -0 krita/plugins/formats/tga/kis_tga_import.cpp M +3 -0 krita/plugins/formats/xcf/kis_xcf_import.cpp M +1 -1 krita/plugins/formats/xcf/tests/CMakeLists.txt http://commits.kde.org/calligra/103a655353c6886f184cdb4311dd3394ee664842 diff --git a/krita/plugins/CMakeLists.txt b/krita/plugins/CMakeLists.txt index 228e13f2..b271c61 100644 --- a/krita/plugins/CMakeLists.txt +++ b/krita/plugins/CMakeLists.txt @@ -1,8 +1,8 @@ add_subdirectory( assistants ) -#add_subdirectory( filters ) +add_subdirectory( filters ) add_subdirectory( tools ) add_subdirectory( extensions ) -#add_subdirectory( generators ) +add_subdirectory( generators ) add_subdirectory( paintops ) -#add_subdirectory( formats ) +add_subdirectory( formats ) add_subdirectory( colorspaces ) diff --git a/krita/plugins/extensions/CMakeLists.txt b/krita/plugins/extens= ions/CMakeLists.txt index 4638084..0a78fa3 100644 --- a/krita/plugins/extensions/CMakeLists.txt +++ b/krita/plugins/extensions/CMakeLists.txt @@ -5,10 +5,10 @@ add_subdirectory( colorrange ) add_subdirectory( colorspaceconversion ) add_subdirectory( dropshadow ) add_subdirectory( histogram ) -#add_subdirectory( imagesize ) +add_subdirectory( imagesize ) add_subdirectory( metadataeditor ) add_subdirectory( modify_selection ) -# add_subdirectory( offsetimage ) +#add_subdirectory( offsetimage ) add_subdirectory( rotateimage ) add_subdirectory( separate_channels ) add_subdirectory( shearimage ) diff --git a/krita/plugins/extensions/gmic/CMakeLists.txt b/krita/plugins/e= xtensions/gmic/CMakeLists.txt index 690438e..06e0c27 100644 --- a/krita/plugins/extensions/gmic/CMakeLists.txt +++ b/krita/plugins/extensions/gmic/CMakeLists.txt @@ -161,6 +161,7 @@ set(kritagmic_PART_SRCS ) add_library(kritagmic MODULE ${kritagmic_PART_SRCS}) target_link_libraries(kritagmic kritaui gmic Qt5::Xml ${ZLIB_LIBRARIES}) +kcoreaddons_desktop_to_json(kritagmic kritagmic.desktop) = # gmicparser for debugging purposes = diff --git a/krita/plugins/extensions/gmic/kis_gmic_plugin.cpp b/krita/plug= ins/extensions/gmic/kis_gmic_plugin.cpp index 9c00465..43a902e 100644 --- a/krita/plugins/extensions/gmic/kis_gmic_plugin.cpp +++ b/krita/plugins/extensions/gmic/kis_gmic_plugin.cpp @@ -67,8 +67,7 @@ #include #include "gmic.h" = -K_PLUGIN_FACTORY_WITH_JSON(KisGmicPluginFactory, registerPlugin();) -K_EXPORT_PLUGIN(KisGmicPluginFactory("krita")) +K_PLUGIN_FACTORY_WITH_JSON(KisGmicPluginFactory, "kritagmic.json", registe= rPlugin();) = const QString STANDARD_GMIC_DEFINITION =3D "gmic_def.gmic"; = diff --git a/krita/plugins/extensions/imagesize/CMakeLists.txt b/krita/plug= ins/extensions/imagesize/CMakeLists.txt index 05af163..f8edf86 100644 --- a/krita/plugins/extensions/imagesize/CMakeLists.txt +++ b/krita/plugins/extensions/imagesize/CMakeLists.txt @@ -15,7 +15,7 @@ ki18n_wrap_ui(kritaimagesize_PART_SRCS ) = add_library(kritaimagesize MODULE ${kritaimagesize_PART_SRCS}) - +kcoreaddons_desktop_to_json(kritaimagesize kritaimagesize.desktop) = = target_link_libraries(kritaimagesize kritaui) diff --git a/krita/plugins/extensions/imagesize/dlg_canvassize.cc b/krita/p= lugins/extensions/imagesize/dlg_canvassize.cc index 59f7d75..84ac6fa 100644 --- a/krita/plugins/extensions/imagesize/dlg_canvassize.cc +++ b/krita/plugins/extensions/imagesize/dlg_canvassize.cc @@ -522,15 +522,16 @@ void DlgCanvasSize::updateYOffsetUIValue(double value) = void DlgCanvasSize::loadAnchorIcons() { - m_anchorIcons[NORTH_WEST] =3D koIcon("arrow_north_west"); - m_anchorIcons[NORTH] =3D koIcon("arrow_north"); - m_anchorIcons[NORTH_EAST] =3D koIcon("arrow_north_east"); - m_anchorIcons[EAST] =3D koIcon("arrow_east"); - m_anchorIcons[CENTER] =3D koIconWanted("though currently m_anchorIcons= [CENTER] is not used","arrow_center"); - m_anchorIcons[WEST] =3D koIcon("arrow_west"); - m_anchorIcons[SOUTH_WEST] =3D koIcon("arrow_south_west"); - m_anchorIcons[SOUTH] =3D koIcon("arrow_south"); - m_anchorIcons[SOUTH_EAST] =3D koIcon("arrow_south_east"); +// QT5PORT +// m_anchorIcons[NORTH_WEST] =3D koIcon("arrow_north_west"); +// m_anchorIcons[NORTH] =3D koIcon("arrow_north"); +// m_anchorIcons[NORTH_EAST] =3D koIcon("arrow_north_east"); +// m_anchorIcons[EAST] =3D koIcon("arrow_east"); +// m_anchorIcons[CENTER] =3D koIconWanted("though currently m_anchorIc= ons[CENTER] is not used","arrow_center"); +// m_anchorIcons[WEST] =3D koIcon("arrow_west"); +// m_anchorIcons[SOUTH_WEST] =3D koIcon("arrow_south_west"); +// m_anchorIcons[SOUTH] =3D koIcon("arrow_south"); +// m_anchorIcons[SOUTH_EAST] =3D koIcon("arrow_south_east"); } = void DlgCanvasSize::updateAnchorIcons(int id) diff --git a/krita/plugins/extensions/imagesize/imagesize.cc b/krita/plugin= s/extensions/imagesize/imagesize.cc index cc7b6df..0296720 100644 --- a/krita/plugins/extensions/imagesize/imagesize.cc +++ b/krita/plugins/extensions/imagesize/imagesize.cc @@ -42,8 +42,7 @@ #include "kis_filter_strategy.h" #include "kis_action.h" = -K_PLUGIN_FACTORY_WITH_JSON(ImageSizeFactory, registerPlugin();) -K_EXPORT_PLUGIN(ImageSizeFactory("krita")) +K_PLUGIN_FACTORY_WITH_JSON(ImageSizeFactory, "kritaimagesize.json", regist= erPlugin();) = ImageSize::ImageSize(QObject *parent, const QVariantList &) : KisViewPlugin(parent) diff --git a/krita/plugins/extensions/offsetimage/offsetimage.cpp b/krita/p= lugins/extensions/offsetimage/offsetimage.cpp index eee8e45..8717f60 100644 --- a/krita/plugins/extensions/offsetimage/offsetimage.cpp +++ b/krita/plugins/extensions/offsetimage/offsetimage.cpp @@ -143,4 +143,4 @@ QRect OffsetImage::offsetWrapRect() = = = -#include "moc_offsetimage.cpp" +#include "offsetimage.moc" diff --git a/krita/plugins/filters/blur/blur.cpp b/krita/plugins/filters/bl= ur/blur.cpp index 1686f46..7d0e4e1 100644 --- a/krita/plugins/filters/blur/blur.cpp +++ b/krita/plugins/filters/blur/blur.cpp @@ -43,3 +43,6 @@ BlurFilterPlugin::BlurFilterPlugin(QObject *parent, const= QVariantList &) BlurFilterPlugin::~BlurFilterPlugin() { } + +#include "blur.moc" + diff --git a/krita/plugins/filters/colors/colors.cpp b/krita/plugins/filter= s/colors/colors.cpp index f17dd26..a8e039b 100644 --- a/krita/plugins/filters/colors/colors.cpp +++ b/krita/plugins/filters/colors/colors.cpp @@ -41,3 +41,5 @@ KritaExtensionsColors::KritaExtensionsColors(QObject *par= ent, const QVariantList KritaExtensionsColors::~KritaExtensionsColors() { } + +#include "colors.moc" diff --git a/krita/plugins/filters/colorsfilters/colorsfilters.cpp b/krita/= plugins/filters/colorsfilters/colorsfilters.cpp index 9ff67ff..2dbd8c4 100644 --- a/krita/plugins/filters/colorsfilters/colorsfilters.cpp +++ b/krita/plugins/filters/colorsfilters/colorsfilters.cpp @@ -178,3 +178,5 @@ void KisAutoContrast::processImpl(KisPaintDeviceSP devi= ce, delete[] transfer; delete adj; } + +#include "colorsfilters.moc" diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.cp= p b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp index 69a691e..24d5efd 100644 --- a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp +++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp @@ -239,3 +239,5 @@ KisLeftEdgeDetectionFilter::KisLeftEdgeDetectionFilter(= ) : KisConvolutionFilter( m_matrix =3D KisConvolutionKernel::fromMatrix(kernelMatrix, 0.5, 1); setIgnoreAlpha(true); } + +#include "convolutionfilters.moc" diff --git a/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp b/krita/pl= ugins/filters/dodgeburn/DodgeBurnPlugin.cpp index 82ecdb3..143a467 100644 --- a/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp +++ b/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp @@ -35,3 +35,5 @@ DodgeBurnPlugin::DodgeBurnPlugin(QObject *parent, const Q= VariantList &) DodgeBurnPlugin::~DodgeBurnPlugin() { } + +#include "DodgeBurnPlugin.moc" diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cp= p b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp index e03a2a0..f05be65 100644 --- a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp +++ b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp @@ -37,3 +37,5 @@ KisEmbossFilterPlugin::KisEmbossFilterPlugin(QObject *par= ent, const QVariantList KisEmbossFilterPlugin::~KisEmbossFilterPlugin() { } + +#include "kis_emboss_filter_plugin.moc" diff --git a/krita/plugins/filters/example/example.cpp b/krita/plugins/filt= ers/example/example.cpp index 6d2f3b5..16d1bc8 100644 --- a/krita/plugins/filters/example/example.cpp +++ b/krita/plugins/filters/example/example.cpp @@ -63,3 +63,4 @@ KoColorTransformation* KisFilterInvert::createTransformat= ion(const KoColorSpace* return cs->createInvertTransformation(); } = +#include "example.moc" diff --git a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp = b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp index 5b7db27..b96334d 100644 --- a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp +++ b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp @@ -172,3 +172,5 @@ void KisFilterFastColorTransfer::processImpl(KisPaintDe= viceSP device, = } } + +#include "fastcolortransfer.moc" diff --git a/krita/plugins/filters/imageenhancement/imageenhancement.cpp b/= krita/plugins/filters/imageenhancement/imageenhancement.cpp index b74d60d..33831971 100644 --- a/krita/plugins/filters/imageenhancement/imageenhancement.cpp +++ b/krita/plugins/filters/imageenhancement/imageenhancement.cpp @@ -52,3 +52,4 @@ KritaImageEnhancement::~KritaImageEnhancement() { } = +#include "imageenhancement.moc" diff --git a/krita/plugins/filters/indexcolors/indexcolors.cpp b/krita/plug= ins/filters/indexcolors/indexcolors.cpp index a2f9716..cd23ec7 100644 --- a/krita/plugins/filters/indexcolors/indexcolors.cpp +++ b/krita/plugins/filters/indexcolors/indexcolors.cpp @@ -141,3 +141,5 @@ void KisIndexColorTransformation::transform(const quint= 8* src, quint8* dst, qint dst +=3D m_psize; } } + +#include "indexcolors.moc" \ No newline at end of file diff --git a/krita/plugins/filters/levelfilter/levelfilter.cpp b/krita/plug= ins/filters/levelfilter/levelfilter.cpp index 1c36385..de1f442 100644 --- a/krita/plugins/filters/levelfilter/levelfilter.cpp +++ b/krita/plugins/filters/levelfilter/levelfilter.cpp @@ -38,3 +38,5 @@ LevelFilter::LevelFilter(QObject *parent, const QVariantL= ist &) LevelFilter::~LevelFilter() { } + +#include "levelfilter.moc" \ No newline at end of file diff --git a/krita/plugins/filters/noisefilter/noisefilter.cpp b/krita/plug= ins/filters/noisefilter/noisefilter.cpp index 9b71a9b..8c4e69c 100644 --- a/krita/plugins/filters/noisefilter/noisefilter.cpp +++ b/krita/plugins/filters/noisefilter/noisefilter.cpp @@ -151,3 +151,5 @@ void KisFilterNoise::processImpl(KisPaintDeviceSP devic= e, delete [] interm; } = +#include "noisefilter.moc" + diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugi= n.cpp b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp index 095530e..4632795 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp @@ -39,3 +39,4 @@ KisOilPaintFilterPlugin::~KisOilPaintFilterPlugin() { } = +#include "kis_oilpaint_filter_plugin.moc" diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugi= n.cpp b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp index d0a3e42..5e9d62d 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp @@ -42,3 +42,6 @@ KisPixelizeFilterPlugin::~KisPixelizeFilterPlugin() { } = +#include "kis_pixelize_filter_plugin.moc" + + diff --git a/krita/plugins/filters/posterize/posterize.cpp b/krita/plugins/= filters/posterize/posterize.cpp index 624f29c..ac9a124 100644 --- a/krita/plugins/filters/posterize/posterize.cpp +++ b/krita/plugins/filters/posterize/posterize.cpp @@ -107,3 +107,5 @@ void KisPosterizeColorTransformation::transform(const q= uint8* src, quint8* dst, dst +=3D m_psize; } } + +#include "posterize.moc" diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plu= gin.cpp b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin= .cpp index 924fdab..8f14ee2 100644 --- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp +++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp @@ -39,3 +39,5 @@ KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(QObjec= t *parent, const QVaria KisRainDropsFilterPlugin::~KisRainDropsFilterPlugin() { } + +#include "kis_raindrops_filter_plugin.moc" diff --git a/krita/plugins/filters/randompickfilter/randompickfilter.cpp b/= krita/plugins/filters/randompickfilter/randompickfilter.cpp index cf56d1a..e2cabc6 100644 --- a/krita/plugins/filters/randompickfilter/randompickfilter.cpp +++ b/krita/plugins/filters/randompickfilter/randompickfilter.cpp @@ -151,3 +151,5 @@ QRect KisFilterRandomPick::neededRect(const QRect& rect= , const KisFilterConfigur int windowsize =3D ceil((config && config->getProperty("windowsize", v= alue)) ? value.toDouble() : 2.5); return rect.adjusted(-windowsize, -windowsize, windowsize, windowsize); } + +#include "randompickfilter.moc" diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter_pl= ugin.cpp b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plug= in.cpp index a13e38c..8f45935 100644 --- a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp +++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp @@ -40,3 +40,4 @@ KisRoundCornersFilterPlugin::~KisRoundCornersFilterPlugin= () { } = +#include "kis_round_corners_filter_plugin.moc" diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_= plugin.cpp b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_= plugin.cpp index 186ee39..e88e2ac 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.= cpp +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.= cpp @@ -39,3 +39,4 @@ KisSmallTilesFilterPlugin::~KisSmallTilesFilterPlugin() { } = +#include "kis_small_tiles_filter_plugin.moc" \ No newline at end of file diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp = b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp index 88a96b8..ce83be6 100644 --- a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp +++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp @@ -39,3 +39,4 @@ KisSobelFilterPlugin::~KisSobelFilterPlugin() { } = +#include "kis_sobel_filter_plugin.moc" diff --git a/krita/plugins/filters/unsharp/tests/CMakeLists.txt b/krita/plu= gins/filters/unsharp/tests/CMakeLists.txt index 8212e36..d1b6de6 100644 --- a/krita/plugins/filters/unsharp/tests/CMakeLists.txt +++ b/krita/plugins/filters/unsharp/tests/CMakeLists.txt @@ -7,4 +7,4 @@ macro_add_unittest_definitions() = set(kis_unsharp_mask_test_SRCS kis_unsharp_mask_test.cpp ) kde4_add_unit_test(KisUnsharpMaskTest TESTNAME krita-ui-kis_unsharp_mask_t= est ${kis_unsharp_mask_test_SRCS}) -target_link_libraries(KisUnsharpMaskTest ${KDE4_KDEUI_LIBS} kritaui ${QT_= QTTEST_LIBRARY}) +target_link_libraries(KisUnsharpMaskTest ${KDE4_KDEUI_LIBS} kritaui Qt5::= Test) diff --git a/krita/plugins/filters/unsharp/unsharp.cpp b/krita/plugins/filt= ers/unsharp/unsharp.cpp index 6a1193a..c9445e1 100644 --- a/krita/plugins/filters/unsharp/unsharp.cpp +++ b/krita/plugins/filters/unsharp/unsharp.cpp @@ -38,3 +38,5 @@ UnsharpPlugin::UnsharpPlugin(QObject *parent, const QVari= antList &) UnsharpPlugin::~UnsharpPlugin() { } + +#include "unsharp.moc" \ No newline at end of file diff --git a/krita/plugins/filters/wavefilter/wavefilter.cpp b/krita/plugin= s/filters/wavefilter/wavefilter.cpp index 07e7919..780c971 100644 --- a/krita/plugins/filters/wavefilter/wavefilter.cpp +++ b/krita/plugins/filters/wavefilter/wavefilter.cpp @@ -174,3 +174,5 @@ QRect KisFilterWave::neededRect(const QRect& rect, cons= t KisFilterConfiguration* int verticalamplitude =3D (config && config->getProperty("verticalampl= itude", value)) ? value.toInt() : 4; return rect.adjusted(-horizontalamplitude, -verticalamplitude, horizon= talamplitude, verticalamplitude); } + +#include "wavefilter.moc" \ No newline at end of file diff --git a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp b/kri= ta/plugins/formats/heightmap/kis_heightmap_export.cpp index 070191b..b3ffed2 100644 --- a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp +++ b/krita/plugins/formats/heightmap/kis_heightmap_export.cpp @@ -169,3 +169,5 @@ KisImportExportFilter::ConversionStatus KisHeightMapExp= ort::convert(const QByteA f.close(); return KisImportExportFilter::OK; } + +#include "kis_heightmap_export.moc" \ No newline at end of file diff --git a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp b/kri= ta/plugins/formats/heightmap/kis_heightmap_import.cpp index ef38fd5..584a5b5 100644 --- a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp +++ b/krita/plugins/formats/heightmap/kis_heightmap_import.cpp @@ -27,6 +27,8 @@ #include = #include +#include +#include = #include #include @@ -199,3 +201,4 @@ KisImportExportFilter::ConversionStatus KisHeightMapImp= ort::convert(const QByteA return KisImportExportFilter::OK; } = +#include "kis_heightmap_import.moc" diff --git a/krita/plugins/formats/odg/kis_odg_import.cc b/krita/plugins/fo= rmats/odg/kis_odg_import.cc index ca87baf..26b05b5 100644 --- a/krita/plugins/formats/odg/kis_odg_import.cc +++ b/krita/plugins/formats/odg/kis_odg_import.cc @@ -155,4 +155,4 @@ KisImportExportFilter::ConversionStatus KisODGImport::c= onvert(const QByteArray& return KisImportExportFilter::OK; } = - +#include "kis_odg_import.moc" diff --git a/krita/plugins/formats/ppm/kis_ppm_export.cpp b/krita/plugins/f= ormats/ppm/kis_ppm_export.cpp index b5c223f..027f6b7 100644 --- a/krita/plugins/formats/ppm/kis_ppm_export.cpp +++ b/krita/plugins/formats/ppm/kis_ppm_export.cpp @@ -289,3 +289,5 @@ KisImportExportFilter::ConversionStatus KisPPMExport::c= onvert(const QByteArray& fp.close(); return KisImportExportFilter::OK; } + +#include "kis_ppm_export.moc" \ No newline at end of file diff --git a/krita/plugins/formats/ppm/kis_ppm_import.cpp b/krita/plugins/f= ormats/ppm/kis_ppm_import.cpp index c6f7063..5a4c3e0 100644 --- a/krita/plugins/formats/ppm/kis_ppm_import.cpp +++ b/krita/plugins/formats/ppm/kis_ppm_import.cpp @@ -27,6 +27,7 @@ #include = #include +#include = #include #include @@ -348,3 +349,5 @@ KisImportExportFilter::ConversionStatus KisPPMImport::l= oadFromDevice(QIODevice* doc->setCurrentImage(image); return KisImportExportFilter::OK; } + +#include "kis_ppm_import.moc" diff --git a/krita/plugins/formats/ppm/tests/CMakeLists.txt b/krita/plugins= /formats/ppm/tests/CMakeLists.txt index 4f1d7b5..c6a859b 100644 --- a/krita/plugins/formats/ppm/tests/CMakeLists.txt +++ b/krita/plugins/formats/ppm/tests/CMakeLists.txt @@ -8,4 +8,4 @@ set(kis_ppm_test_SRCS kis_ppm_test.cpp ) = kde4_add_unit_test(kis_ppm_test TESTNAME krita-plugin-format-ppm_test ${ki= s_ppm_test_SRCS}) = -target_link_libraries(kis_ppm_test ${KDE4_KDEUI_LIBS} kritaui ${QT_QTTEST= _LIBRARY}) +target_link_libraries(kis_ppm_test ${KDE4_KDEUI_LIBS} kritaui Qt5::Test) diff --git a/krita/plugins/formats/psd/psd_export.cc b/krita/plugins/format= s/psd/psd_export.cc index 10e7448..21dfaa5 100644 --- a/krita/plugins/formats/psd/psd_export.cc +++ b/krita/plugins/formats/psd/psd_export.cc @@ -22,6 +22,7 @@ = #include #include +#include = #include #include diff --git a/krita/plugins/formats/psd/psd_import.cc b/krita/plugins/format= s/psd/psd_import.cc index 71522ee..d94416f 100644 --- a/krita/plugins/formats/psd/psd_import.cc +++ b/krita/plugins/formats/psd/psd_import.cc @@ -18,6 +18,7 @@ #include "psd_import.h" = #include +#include = #include = diff --git a/krita/plugins/formats/psd/psd_loader.h b/krita/plugins/formats= /psd/psd_loader.h index 8e6ab04..e242de4 100644 --- a/krita/plugins/formats/psd/psd_loader.h +++ b/krita/plugins/formats/psd/psd_loader.h @@ -23,6 +23,7 @@ #include = #include +#include = #include "kis_types.h" class KisDocument; diff --git a/krita/plugins/formats/psd/psd_saver.h b/krita/plugins/formats/= psd/psd_saver.h index 337b2b3..72a723b 100644 --- a/krita/plugins/formats/psd/psd_saver.h +++ b/krita/plugins/formats/psd/psd_saver.h @@ -23,6 +23,7 @@ #include = #include +#include = #include "kis_types.h" class KisDocument; diff --git a/krita/plugins/formats/qml/qml_converter.h b/krita/plugins/form= ats/qml/qml_converter.h index d6e1beb..13cca68 100644 --- a/krita/plugins/formats/qml/qml_converter.h +++ b/krita/plugins/formats/qml/qml_converter.h @@ -23,6 +23,7 @@ #include = // #include +#include = #include "kis_types.h" = diff --git a/krita/plugins/formats/tga/kis_tga_export.cpp b/krita/plugins/f= ormats/tga/kis_tga_export.cpp index e9ad3df..2d818a8 100644 --- a/krita/plugins/formats/tga/kis_tga_export.cpp +++ b/krita/plugins/formats/tga/kis_tga_export.cpp @@ -24,6 +24,7 @@ = #include #include +#include = #include = diff --git a/krita/plugins/formats/tga/kis_tga_import.cpp b/krita/plugins/f= ormats/tga/kis_tga_import.cpp index dfc961e..68cdd52 100644 --- a/krita/plugins/formats/tga/kis_tga_import.cpp +++ b/krita/plugins/formats/tga/kis_tga_import.cpp @@ -25,6 +25,7 @@ #include = #include +#include = #include = diff --git a/krita/plugins/formats/xcf/kis_xcf_import.cpp b/krita/plugins/f= ormats/xcf/kis_xcf_import.cpp index 374e3c9..5f8b522 100644 --- a/krita/plugins/formats/xcf/kis_xcf_import.cpp +++ b/krita/plugins/formats/xcf/kis_xcf_import.cpp @@ -26,6 +26,7 @@ #include = #include +#include = #include = @@ -316,3 +317,5 @@ KisImportExportFilter::ConversionStatus KisXCFImport::l= oadFromDevice(QIODevice* doc->setCurrentImage(image); return KisImportExportFilter::OK; } + +#include "kis_xcf_import.moc" diff --git a/krita/plugins/formats/xcf/tests/CMakeLists.txt b/krita/plugins= /formats/xcf/tests/CMakeLists.txt index 32bec0e..db5beeb 100644 --- a/krita/plugins/formats/xcf/tests/CMakeLists.txt +++ b/krita/plugins/formats/xcf/tests/CMakeLists.txt @@ -8,4 +8,4 @@ set(kis_xcf_test_SRCS kis_xcf_test.cpp ) = kde4_add_unit_test(kis_xcf_test TESTNAME krita-plugin-format-xcf_test ${ki= s_xcf_test_SRCS}) = -target_link_libraries(kis_xcf_test ${KDE4_KDEUI_LIBS} kritaui ${QT_QTTEST= _LIBRARY}) +target_link_libraries(kis_xcf_test ${KDE4_KDEUI_LIBS} kritaui Qt5::Test)