Commit 781ac121 authored by Halla Rempt's avatar Halla Rempt

Merge remote-tracking branch 'origin' into frameworks

Conflicts:
	krita/plugins/formats/xcf/3rdparty/xcftools/config.h
	krita/ui/CMakeLists.txt
	krita/ui/KisDocumentEntry.h
	krita/ui/KisFilterEntry.h
	krita/ui/canvas/kis_grid_manager.cpp
	krita/ui/input/wintab/kis_tablet_support_x11.h
	libs/db/expression.cpp
parents 96644403 a3594d97
......@@ -5,4 +5,4 @@ install(FILES
scRGB.icm
cmyk.icm
krita25_lcms-builtin-sRGB_g100-truegamma.icc
DESTINATION ${DATA_INSTALL_DIR}/color/icc/krita)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/color/icc/krita)
......@@ -47,4 +47,4 @@ install(FILES
WideRGB-elle-V4-g10.icc
WideRGB-elle-V4-g22.icc
WideRGB-elle-V4-srgbtrc.icc
DESTINATION ${DATA_INSTALL_DIR}/color/icc/krita)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/color/icc/krita)
......@@ -99,6 +99,7 @@ set(kritaimage_LIB_SRCS
commands_new/kis_set_layer_style_command.cpp
commands_new/kis_selection_move_command2.cpp
commands_new/kis_update_command.cpp
commands_new/kis_activate_selection_mask_command.cpp
processing/kis_do_nothing_processing_visitor.cpp
processing/kis_simple_processing_visitor.cpp
processing/kis_crop_processing_visitor.cpp
......@@ -380,7 +381,7 @@ install( FILES
kis_shared_ptr.h
kis_transaction.h
kis_types.h
krita_export.h
kritaimage_export.h
filter/kis_filter_configuration.h
generator/kis_generator.h
generator/kis_generator_registry.h
......
......@@ -24,7 +24,7 @@
#include "kis_global.h"
#include "kis_vec.h"
#include "krita_export.h"
#include "kritaimage_export.h"
#include "kis_distance_information.h"
class QDomDocument;
......
......@@ -28,7 +28,7 @@
#include "kis_types.h"
#include "kis_paintop_settings.h"
#include <krita_export.h>
#include <kritaimage_export.h>
class QPointF;
class KoColorSpace;
......
......@@ -19,7 +19,7 @@
#ifndef KIS_PAINTOP_CONFIG_WIDGET_H_
#define KIS_PAINTOP_CONFIG_WIDGET_H_
#include "krita_export.h"
#include "kritaimage_export.h"
#include "kis_config_widget.h"
#include "kis_image.h"
......
......@@ -20,7 +20,7 @@
#define KIS_PAINTOP_FACTORY_H_
#include "kis_types.h"
#include "krita_export.h"
#include "kritaimage_export.h"
#include <QObject>
#include <QString>
#include <QStringList>
......
......@@ -26,7 +26,6 @@
#include <QImageReader>
#include <QDomDocument>
#include <QBuffer>
#include <QCryptographicHash>
#include <KoInputDevice.h>
......@@ -316,23 +315,6 @@ void KisPaintOpPreset::fromXML(const QDomElement& presetElt)
}
QByteArray KisPaintOpPreset::generateMD5() const
{
QByteArray ba;
QBuffer buf(&ba);
buf.open(QBuffer::WriteOnly);
saveToDevice(&buf);
buf.close();
if (!ba.isEmpty()) {
QCryptographicHash md5(QCryptographicHash::Md5);
md5.addData(ba);
return md5.result();
}
return ba;
}
bool KisPaintOpPreset::saveToDevice(QIODevice *dev) const
{
QImageWriter writer(dev, "PNG");
......@@ -355,6 +337,8 @@ bool KisPaintOpPreset::saveToDevice(QIODevice *dev) const
m_d->dirtyPreset = false;
KoResource::saveToDevice(dev);
return writer.write(img);
}
......
......@@ -24,7 +24,7 @@
#include "kis_types.h"
#include "kis_shared.h"
#include "krita_export.h"
#include "kritaimage_export.h"
/**
......@@ -103,10 +103,6 @@ public:
bool m_isDirty;
};
protected:
virtual QByteArray generateMD5() const;
private:
struct Private;
......
......@@ -30,7 +30,7 @@
#include "kis_paintop_preset.h"
#include <kis_threaded_text_rendering_workaround.h>
#include <krita_export.h>
#include <kritaimage_export.h>
class KisPaintOp;
......
......@@ -20,7 +20,7 @@
#define KIS_PAINTOP_SETTINGS_H_
#include "kis_types.h"
#include "krita_export.h"
#include "kritaimage_export.h"
#include <QImage>
#include <QScopedPointer>
......
......@@ -19,7 +19,7 @@
#ifndef __KIS_BSPLINE_1D_H
#define __KIS_BSPLINE_1D_H
#include <krita_export.h>
#include <kritaimage_export.h>
#include <QScopedPointer>
#include <QVector>
......
......@@ -19,7 +19,7 @@
#ifndef __KIS_BSPLINE_2D_H
#define __KIS_BSPLINE_2D_H
#include <krita_export.h>
#include <kritaimage_export.h>
#include <QScopedPointer>
#include <QVector>
......
......@@ -19,7 +19,7 @@
#ifndef __KIS_NU_BSPLINE_2D_H
#define __KIS_NU_BSPLINE_2D_H
#include <krita_export.h>
#include <kritaimage_export.h>
#include <QScopedPointer>
#include <QVector>
......
......@@ -18,7 +18,6 @@
#ifndef KIS_CHANGE_FILTER_COMMAND_H
#define KIS_CHANGE_FILTER_COMMAND_H
#include <krita_export.h>
#include <kundo2command.h>
#include <QRect>
#include "kis_types.h"
......
......@@ -18,7 +18,7 @@
#ifndef KIS_DESELECT_GLOBAL_SELECTION_COMMAND_H_
#define KIS_DESELECT_GLOBAL_SELECTION_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include <kundo2command.h>
#include "kis_types.h"
......
......@@ -20,7 +20,7 @@
#ifndef KIS_IMAGE_CHANGE_LAYERS_COMMAND_H_
#define KIS_IMAGE_CHANGE_LAYERS_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -20,7 +20,7 @@
#ifndef KIS_IMAGE_COMMAND_H_
#define KIS_IMAGE_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include <kundo2command.h>
......
......@@ -20,7 +20,7 @@
#ifndef KIS_IMAGE_LAYER_ADD_COMMAND_H_
#define KIS_IMAGE_LAYER_ADD_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -20,7 +20,7 @@
#ifndef KIS_IMAGE_LAYER_MOVE_COMMAND_H_
#define KIS_IMAGE_LAYER_MOVE_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include <QSize>
#include <QBitArray>
......
......@@ -19,7 +19,7 @@
#ifndef __KIS_IMAGE_LAYER_REMOVE_COMMAND_H
#define __KIS_IMAGE_LAYER_REMOVE_COMMAND_H
#include "krita_export.h"
#include "kritaimage_export.h"
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -22,7 +22,7 @@
#include <QList>
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -20,8 +20,6 @@
#ifndef KIS_IMAGE_LOCK_COMMAND_H_
#define KIS_IMAGE_LOCK_COMMAND_H_
#include <krita_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -19,7 +19,7 @@
#ifndef KIS_IMAGE_NODE_LOWER_COMMAND_H_
#define KIS_IMAGE_NODE_LOWER_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -19,7 +19,7 @@
#ifndef KIS_IMAGE_NODE_RAISE_COMMAND_H_
#define KIS_IMAGE_NODE_RAISE_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -19,7 +19,7 @@
#ifndef KIS_IMAGE_NODE_TO_BOTTOM_COMMAND_H_
#define KIS_IMAGE_NODE_TO_BOTTOM_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -19,7 +19,7 @@
#ifndef KIS_IMAGE_NODE_TO_TOP_COMMAND_H_
#define KIS_IMAGE_NODE_TO_TOP_COMMAND_H_
#include <krita_export.h>
#include <kritaimage_export.h>
#include "kis_types.h"
#include "kis_image_command.h"
......
......@@ -20,7 +20,6 @@
#ifndef KIS_IMAGE_SET_PROJECTION_COLOR_SPACE_COMMAND_H_
#define KIS_IMAGE_SET_PROJECTION_COLOR_SPACE_COMMAND_H_
#include <krita_export.h>
#include "kis_image_command.h"
class KoColorSpace;
......
......@@ -20,7 +20,7 @@
#define KIS_LAYER_COMMAND_H_
#include <kundo2command.h>
#include <krita_export.h>