Diffusion Krita 247ab26bfce6

Merge branch 'master' into rempt/T379-resource-management
247ab26bfce6
Actions

Authored by rempt on Feb 10 2020, 12:40 PM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Feb 10 2020, 12:40 PM

Parents

R37:3da1e8e41cf6: Implement favouriteResourcesList() to use models
R37:c4ce32ecbae8: Use getUIMin/Max only for Lab and RGB

Branches

Unknown

Tags

Unknown

References

refs/keep-around/247ab26bfce640c16eee8991c82ef4136404e0ad

rempt committed R37:247ab26bfce6: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Feb 10 2020, 12:40 PM

Merged Changes

Commit	Author	Details	Committed
c4ce32ecbae8	lsegovia	Use getUIMin/Max only for Lab and RGB	Feb 8 2020
2681f5d77623	lsegovia	Fix deserialization of CMYK colors	Feb 7 2020
ba4e4846eef0	rempt	Fix building with Qt 5.9	Feb 7 2020
b318a6dbccdf	dkazakov	Fix safe asserts in KisLazyBrushTest	Feb 7 2020
1713d09f9b1e	dkazakov	Fix KisLazyBrushTest failure	Feb 7 2020
81372da11668	dkazakov	Remove all the usages of KisImage::lock()	Feb 6 2020
45fa9fb936bb	dkazakov	Fix possible deadlocks in KisShapeLayer and KisShapeLayerCanvas	Feb 6 2020
51281c7680c1	rempt	Try to make ext_expat work on the binary factory	Feb 6 2020
33cca6f80e35	rempt	Try to build expat explicitly, maybe that fixes things.	Feb 6 2020

Changes (40)

				Path	Packages
	M			3rdparty/ext_expat/CMakeLists.txt
	M			libs/global/kis_signal_compressor_with_param.cpp
	M			libs/global/kis_signal_compressor_with_param.h
	M			libs/image/CMakeLists.txt
	A			libs/image/KisBusyWaitBroker.cpp
	A			libs/image/KisBusyWaitBroker.h
	P			libs/image/KisSafeBlockingQueueConnectionProxy.cpp Copied from libs/ui/kis_gui_context_command_p.cpp
	A			libs/image/KisSafeBlockingQueueConnectionProxy.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_legacy_undo_adapter.cpp
	M			libs/image/tests/kis_layer_test.cpp
	M			libs/image/tests/kis_lazy_brush_test.cpp
	M			libs/image/tests/kis_simple_update_queue_test.cpp
	M			libs/image/tests/kis_update_scheduler_test.cpp
	M			libs/image/tests/kis_updater_context_test.cpp
	M			libs/image/tests/kis_walkers_test.cpp
	M			libs/pigment/KoCmykColorSpaceMaths.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer.h
	M			libs/ui/flake/kis_shape_layer_canvas.cpp
	M			libs/ui/flake/kis_shape_layer_canvas.h
	M			libs/ui/kis_animation_importer.cpp
	M			libs/ui/kis_custom_pattern.cc
	M			libs/ui/widgets/kis_floating_message.cpp
	M			libs/widgets/kis_spinbox_color_selector.cpp
	M			packaging/linux/appimage/build-deps.sh
	M			plugins/color/lcms2engine/colorspaces/cmyk_f32/CmykF32ColorSpace.cpp
	M			plugins/dockers/advancedcolorselector/kis_shade_selector_line_combo_box.cpp
	M			plugins/extensions/layersplit/layersplit.cpp
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/extensions/separate_channels/kis_channel_separator.cc
	M			plugins/impex/csv/csv_loader.cpp
	M			plugins/impex/libkra/tests/kis_kra_loader_test.cpp
	M			plugins/impex/psd/psd_loader.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rwidgetutils.cpp
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			sdk/tests/stroke_testing_utils.cpp