fix building of fileformats and filters

krita/plugins/CMakeLists.txt

 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 )

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 )

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
 

krita/plugins/extensions/gmic/kis_gmic_plugin.cpp

@@ -67,8 +67,7 @@
 #include <kis_gmic_small_applicator.h>
 #include "gmic.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(KisGmicPluginFactory, registerPlugin<KisGmicPlugin>();)
-K_EXPORT_PLUGIN(KisGmicPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisGmicPluginFactory, "kritagmic.json", registerPlugin<KisGmicPlugin>();)
 
 const QString STANDARD_GMIC_DEFINITION = "gmic_def.gmic";
 

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)

krita/plugins/extensions/imagesize/dlg_canvassize.cc

@@ -522,15 +522,16 @@ void DlgCanvasSize::updateYOffsetUIValue(double value)
 
 void DlgCanvasSize::loadAnchorIcons()
 {
-    m_anchorIcons[NORTH_WEST] =  koIcon("arrow_north_west");
-    m_anchorIcons[NORTH] = koIcon("arrow_north");
-    m_anchorIcons[NORTH_EAST] = koIcon("arrow_north_east");
-    m_anchorIcons[EAST] = koIcon("arrow_east");
-    m_anchorIcons[CENTER] = koIconWanted("though currently m_anchorIcons[CENTER] is not used","arrow_center");
-    m_anchorIcons[WEST] = koIcon("arrow_west");
-    m_anchorIcons[SOUTH_WEST] = koIcon("arrow_south_west");
-    m_anchorIcons[SOUTH] = koIcon("arrow_south");
-    m_anchorIcons[SOUTH_EAST] = koIcon("arrow_south_east");
+//     QT5PORT
+//     m_anchorIcons[NORTH_WEST] =  koIcon("arrow_north_west");
+//     m_anchorIcons[NORTH] = koIcon("arrow_north");
+//     m_anchorIcons[NORTH_EAST] = koIcon("arrow_north_east");
+//     m_anchorIcons[EAST] = koIcon("arrow_east");
+//     m_anchorIcons[CENTER] = koIconWanted("though currently m_anchorIcons[CENTER] is not used","arrow_center");
+//     m_anchorIcons[WEST] = koIcon("arrow_west");
+//     m_anchorIcons[SOUTH_WEST] = koIcon("arrow_south_west");
+//     m_anchorIcons[SOUTH] = koIcon("arrow_south");
+//     m_anchorIcons[SOUTH_EAST] = koIcon("arrow_south_east");
 }
 
 void DlgCanvasSize::updateAnchorIcons(int id)

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<ImageSize>();)
-K_EXPORT_PLUGIN(ImageSizeFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(ImageSizeFactory, "kritaimagesize.json", registerPlugin<ImageSize>();)
 
 ImageSize::ImageSize(QObject *parent, const QVariantList &)
         : KisViewPlugin(parent)

krita/plugins/extensions/offsetimage/offsetimage.cpp

@@ -143,4 +143,4 @@ QRect OffsetImage::offsetWrapRect()
 
 
 
-#include "moc_offsetimage.cpp"
+#include "offsetimage.moc"

krita/plugins/filters/blur/blur.cpp

@@ -43,3 +43,6 @@ BlurFilterPlugin::BlurFilterPlugin(QObject *parent, const QVariantList &)
 BlurFilterPlugin::~BlurFilterPlugin()
 {
 }
+
+#include "blur.moc"
+

krita/plugins/filters/colors/colors.cpp

@@ -41,3 +41,5 @@ KritaExtensionsColors::KritaExtensionsColors(QObject *parent, const QVariantList
 KritaExtensionsColors::~KritaExtensionsColors()
 {
 }
+
+#include "colors.moc"

krita/plugins/filters/colorsfilters/colorsfilters.cpp

@@ -178,3 +178,5 @@ void KisAutoContrast::processImpl(KisPaintDeviceSP device,
     delete[] transfer;
     delete adj;
 }
+
+#include "colorsfilters.moc"

krita/plugins/filters/convolutionfilters/convolutionfilters.cpp

@@ -239,3 +239,5 @@ KisLeftEdgeDetectionFilter::KisLeftEdgeDetectionFilter() : KisConvolutionFilter(
     m_matrix = KisConvolutionKernel::fromMatrix(kernelMatrix, 0.5, 1);
     setIgnoreAlpha(true);
 }
+
+#include "convolutionfilters.moc"

krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp

@@ -35,3 +35,5 @@ DodgeBurnPlugin::DodgeBurnPlugin(QObject *parent, const QVariantList &)
 DodgeBurnPlugin::~DodgeBurnPlugin()
 {
 }
+
+#include "DodgeBurnPlugin.moc"

krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp

@@ -37,3 +37,5 @@ KisEmbossFilterPlugin::KisEmbossFilterPlugin(QObject *parent, const QVariantList
 KisEmbossFilterPlugin::~KisEmbossFilterPlugin()
 {
 }
+
+#include "kis_emboss_filter_plugin.moc"

krita/plugins/filters/example/example.cpp

@@ -63,3 +63,4 @@ KoColorTransformation* KisFilterInvert::createTransformation(const KoColorSpace*
     return cs->createInvertTransformation();
 }
 
+#include "example.moc"

krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp

@@ -172,3 +172,5 @@ void KisFilterFastColorTransfer::processImpl(KisPaintDeviceSP device,
 
     }
 }
+
+#include "fastcolortransfer.moc"

krita/plugins/filters/imageenhancement/imageenhancement.cpp

@@ -52,3 +52,4 @@ KritaImageEnhancement::~KritaImageEnhancement()
 {
 }
 
+#include "imageenhancement.moc"

krita/plugins/filters/indexcolors/indexcolors.cpp

@@ -141,3 +141,5 @@ void KisIndexColorTransformation::transform(const quint8* src, quint8* dst, qint
         dst += m_psize;
     }
 }
+
+#include "indexcolors.moc"
\ No newline at end of file

krita/plugins/filters/levelfilter/levelfilter.cpp

@@ -38,3 +38,5 @@ LevelFilter::LevelFilter(QObject *parent, const QVariantList &)
 LevelFilter::~LevelFilter()
 {
 }
+
+#include "levelfilter.moc"
\ No newline at end of file

krita/plugins/filters/noisefilter/noisefilter.cpp

@@ -151,3 +151,5 @@ void KisFilterNoise::processImpl(KisPaintDeviceSP device,
     delete [] interm;
 }
 
+#include "noisefilter.moc"
+

krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp

@@ -39,3 +39,4 @@ KisOilPaintFilterPlugin::~KisOilPaintFilterPlugin()
 {
 }
 
+#include "kis_oilpaint_filter_plugin.moc"

krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp

@@ -42,3 +42,6 @@ KisPixelizeFilterPlugin::~KisPixelizeFilterPlugin()
 {
 }
 
+#include "kis_pixelize_filter_plugin.moc"
+
+

krita/plugins/filters/posterize/posterize.cpp

@@ -107,3 +107,5 @@ void KisPosterizeColorTransformation::transform(const quint8* src, quint8* dst,
         dst += m_psize;
     }
 }
+
+#include "posterize.moc"

krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp

@@ -39,3 +39,5 @@ KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(QObject *parent, const QVaria
 KisRainDropsFilterPlugin::~KisRainDropsFilterPlugin()
 {
 }
+
+#include "kis_raindrops_filter_plugin.moc"

krita/plugins/filters/randompickfilter/randompickfilter.cpp

@@ -151,3 +151,5 @@ QRect KisFilterRandomPick::neededRect(const QRect& rect, const KisFilterConfigur
     int windowsize = ceil((config && config->getProperty("windowsize", value)) ? value.toDouble() : 2.5);
     return rect.adjusted(-windowsize, -windowsize, windowsize, windowsize);
 }
+
+#include "randompickfilter.moc"

krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp

@@ -40,3 +40,4 @@ KisRoundCornersFilterPlugin::~KisRoundCornersFilterPlugin()
 {
 }
 
+#include "kis_round_corners_filter_plugin.moc"

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

krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp

@@ -39,3 +39,4 @@ KisSobelFilterPlugin::~KisSobelFilterPlugin()
 {
 }
 
+#include "kis_sobel_filter_plugin.moc"

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_test  ${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)

krita/plugins/filters/unsharp/unsharp.cpp

@@ -38,3 +38,5 @@ UnsharpPlugin::UnsharpPlugin(QObject *parent, const QVariantList &)
 UnsharpPlugin::~UnsharpPlugin()
 {
 }
+
+#include "unsharp.moc"
\ No newline at end of file

krita/plugins/filters/wavefilter/wavefilter.cpp

@@ -174,3 +174,5 @@ QRect KisFilterWave::neededRect(const QRect& rect, const KisFilterConfiguration*
     int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4;
     return rect.adjusted(-horizontalamplitude, -verticalamplitude, horizontalamplitude, verticalamplitude);
 }
+
+#include "wavefilter.moc"
\ No newline at end of file

krita/plugins/formats/heightmap/kis_heightmap_export.cpp

@@ -169,3 +169,5 @@ KisImportExportFilter::ConversionStatus KisHeightMapExport::convert(const QByteA
     f.close();
     return KisImportExportFilter::OK;
 }
+
+#include "kis_heightmap_export.moc"
\ No newline at end of file

krita/plugins/formats/heightmap/kis_heightmap_import.cpp

@@ -27,6 +27,8 @@
 #include <QCursor>
 
 #include <kpluginfactory.h>
+#include <kurl.h>
+#include <kdialog.h>
 
 #include <KisImportExportManager.h>
 #include <KoColorSpaceRegistry.h>
@@ -199,3 +201,4 @@ KisImportExportFilter::ConversionStatus KisHeightMapImport::convert(const QByteA
     return KisImportExportFilter::OK;
 }
 
+#include "kis_heightmap_import.moc"

krita/plugins/formats/odg/kis_odg_import.cc

@@ -155,4 +155,4 @@ KisImportExportFilter::ConversionStatus KisODGImport::convert(const QByteArray&
     return KisImportExportFilter::OK;
 }
 
-
+#include "kis_odg_import.moc"

krita/plugins/formats/ppm/kis_ppm_export.cpp

@@ -289,3 +289,5 @@ KisImportExportFilter::ConversionStatus KisPPMExport::convert(const QByteArray&
     fp.close();
     return KisImportExportFilter::OK;
 }
+
+#include "kis_ppm_export.moc"
\ No newline at end of file

krita/plugins/formats/ppm/kis_ppm_import.cpp

@@ -27,6 +27,7 @@
 #include <kpluginfactory.h>
 
 #include <kio/netaccess.h>
+#include <kurl.h>
 
 #include <KoColorSpaceRegistry.h>
 #include <KisFilterChain.h>
@@ -348,3 +349,5 @@ KisImportExportFilter::ConversionStatus KisPPMImport::loadFromDevice(QIODevice*
     doc->setCurrentImage(image);
     return KisImportExportFilter::OK;
 }
+
+#include "kis_ppm_import.moc"

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 ${kis_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)

krita/plugins/formats/psd/psd_export.cc

@@ -22,6 +22,7 @@
 
 #include <kpluginfactory.h>
 #include <QMessageBox>
+#include <kurl.h>
 
 #include <KisImportExportManager.h>
 #include <KisFilterChain.h>

krita/plugins/formats/psd/psd_import.cc

@@ -18,6 +18,7 @@
 #include "psd_import.h"
 
 #include <kpluginfactory.h>
+#include <kurl.h>
 
 #include <KisFilterChain.h>
 

krita/plugins/formats/psd/psd_loader.h

@@ -23,6 +23,7 @@
 #include <QObject>
 
 #include <kio/job.h>
+#include <kurl.h>
 
 #include "kis_types.h"
 class KisDocument;

krita/plugins/formats/psd/psd_saver.h

@@ -23,6 +23,7 @@
 #include <QObject>
 
 #include <kio/job.h>
+#include <kurl.h>
 
 #include "kis_types.h"
 class KisDocument;

krita/plugins/formats/qml/qml_converter.h

@@ -23,6 +23,7 @@
 #include <QObject>
 
 // #include <kio/job.h>
+#include <kurl.h>
 
 #include "kis_types.h"
 

krita/plugins/formats/tga/kis_tga_export.cpp

@@ -24,6 +24,7 @@
 
 #include <kdialog.h>
 #include <kpluginfactory.h>
+#include <kurl.h>
 
 #include <KisFilterChain.h>
 

krita/plugins/formats/tga/kis_tga_import.cpp

@@ -25,6 +25,7 @@
 #include <QApplication>
 
 #include <kio/netaccess.h>
+#include <kurl.h>
 
 #include <kpluginfactory.h>
 

krita/plugins/formats/xcf/kis_xcf_import.cpp

@@ -26,6 +26,7 @@
 #include <qendian.h>
 
 #include <kpluginfactory.h>
+#include <kurl.h>
 
 #include <kio/netaccess.h>
 
@@ -316,3 +317,5 @@ KisImportExportFilter::ConversionStatus KisXCFImport::loadFromDevice(QIODevice*
     doc->setCurrentImage(image);
     return KisImportExportFilter::OK;
 }
+
+#include "kis_xcf_import.moc"

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 ${kis_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)