Diffusion Krita 6d0852142c66

Merge branch 'master' of invent.kde.org:kde/krita
6d0852142c66
Actions

Authored by sh-zam on Nov 30 2019, 1:48 PM.

Description

Merge branch 'master' of invent.kde.org:kde/krita

Conflicts:
libs/ui/kis_statusbar.cc

Details

Committed

sh-zam

Nov 30 2019, 4:20 PM

Parents

R37:9ab5b107d233: Bugfix: S-pen not drawing
R37:dea9c67c4272: fix build break caused qComapre QRect and QRectF

Branches

Unknown

Tags

Unknown

References

refs/keep-around/6d0852142c6678c74bd6684da04530d5be8ab147

sh-zam committed R37:6d0852142c66: Merge branch 'master' of invent.kde.org:kde/krita (authored by sh-zam).Nov 30 2019, 4:20 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
dea9c67c4272	shiyan/rempt	fix build break caused qComapre QRect and QRectF	Nov 27 2019
d19b0b6c5f88	rempt	BUG:414536 Use correct version check	Nov 26 2019
bbb9075c3f0a	kamathraghavendra/rempt	Change the position of reset rotation button	Nov 25 2019
d3ce782fa569	rempt	Update .gitignore with the latest mouse drops from Qt Creator	Nov 23 2019
0018d78eeb09	rempt	Don't build the jp2 plugin on freebsd	Nov 22 2019
566ad2c2c638	rempt	Fix build with Qt 5.9	Nov 22 2019
43b40dca72da	rempt	Hide the Help button in dialog window titlebars	Nov 20 2019
f41bc3f833c2	dkazakov	Fix compilation of unittests	Nov 20 2019
a918a7cb40db	dkazakov	Fix KisDecorationsWrapperLayer to set up default bounds correctly	Nov 20 2019
d2fed9463796	rempt	Revert "Let's try once more to fix jp2 on freebsd"	Nov 20 2019
77c57103e7b9	dkazakov	Fix crash when moving a layer under a transformation mask	Nov 20 2019
4686d100ce0c	dkazakov	Add a bit of debugging capabilities to KisCachedPaintDevice	Nov 20 2019
e57bcfc223f9	dkazakov	Implement KisDefaultBounds::sourceCookie()	Nov 20 2019
62bdc0480443	dkazakov	Fix constness in KisLocklessStack	Nov 20 2019
b3c150e21993	dkazakov	Make sure that fake original() of KisFileLayer has defaultBounds() set	Nov 20 2019
a1c740344845	rempt	Let's try once more to fix jp2 on freebsd	Nov 20 2019
92178e8a89c3	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 20 2019
2d4ae8c38295	rempt	Get exiv from our own download location	Nov 19 2019
e37f64c44483	dkazakov	Fix outline in Move Tool, when a layer has a Transform Mask	Nov 19 2019
7a709c5480aa	dkazakov	Fix undo of replacing vector selection	Nov 19 2019
99b25ed82b44	rempt	Hide superfluous warning	Nov 19 2019
e38ce58c7a63	dkazakov	Fix synchronization of sliders in Performance tab in the Settings	Nov 18 2019
7b0359f1ccda	dkazakov	Don't update paint layer when onion skins are disabled	Nov 18 2019
1ba0a6baf172	dkazakov	Fix color space of onion skins cache device	Nov 18 2019
adafa8b73887	dkazakov	Fix transforming layers that have Onion Skins enabled	Nov 18 2019
938bf9ec4c51	vanyossi	Fix missing comment start sequence	Nov 16 2019
d457fbdaf2d5	rempt	Mark retval as explicitly unused	Nov 15 2019
ad2373e95f22	rempt	Merge branch 'master' into rempt/set-preferences-on-close	Nov 15 2019
4356f2a707ca	tusooaw	Fix bug in polygon tool that adds an extra point	Nov 14 2019
aa81b8498e93	dkazakov	Fix brush rendering on low-precision levels (1 and 2)	Nov 14 2019
0dbc8822e0d0	dkazakov	Fix saving non-srgb color profiles into PNG	Nov 14 2019
f683f82b4f30	dkazakov	Remove unused file	Nov 13 2019
433244e53e3c	dkazakov	Fix transform tool to work correctly with selection mask's overlay	Nov 13 2019
b7a9efed95c3	dkazakov	Fix compilation	Nov 13 2019
b9f7132e8835	dkazakov	Fix warnings at the tail of ASSERTRECOVER lines	Nov 13 2019
7ec0e67e771e	dkazakov	Add debugging capabilities to KisUpdateJobItem	Nov 13 2019
b1bccb81547b	dkazakov	Fix cloning of the image with overlay selection mask	Nov 13 2019
77717dbb7196	dkazakov	Disconnect move tool from canvas signals when it is not activated	Nov 13 2019
c1f5d964ac8e	dkazakov	Fix KisShapeSelection not to cause any updates while cloning	Nov 13 2019
be44f67e94f9	dkazakov	Fix KisSelectionMask not to cause any updates when cloning	Nov 13 2019
434c85828b3b	vanyossi	Allow export dialog preferences to be saved	Nov 13 2019
aee9bb32831f	vanyossi	Add missing overrides	Nov 13 2019
474ce798dae1	rempt	Don't confuse MOC with examples in the apidox	Nov 11 2019
8c53a59da010	dkazakov	Remove Show Decorations option from Transform Tool	Nov 11 2019
e2eb135674f0	dkazakov	Fix profile when loading image with non-default profiles	Nov 11 2019
5a5c78cb4c97	dkazakov	Fix comparison operator in KoColorProfile	Nov 11 2019
690cee59f11d	rempt	Set the preferences when closing the preferences dialog	Nov 11 2019
b18e3df35560	dkazakov	Fix crash when opening image with a Clone Layer and IP active	Nov 11 2019
a8c0351c7495	vanyossi	Close ColorDialog if parent pointer is destroyed	Nov 11 2019
e27ab3a7382d	vanyossi	Fix native dialog save/open on macos 10.15	Nov 11 2019

Changes (242)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
A		3rdparty/ext_qt/0081-non-native-file-dialog-overwrite-warnings-based-on-filter.patch
A		3rdparty/ext_qt/0082-jpeg-extensions-handling-in-non-native-file-dialogs.patch
M		3rdparty/ext_qt/CMakeLists.txt
M		CMakeLists.txt
M		krita/data/CMakeLists.txt
M		krita/data/aboutdata/libraries.txt
A	(dir)	krita/data/sessions/
A		krita/data/sessions/Painting with references.ksn
A		krita/data/sessions/Working with references.ksn
A	(dir)	krita/data/windowlayouts/
A		krita/data/windowlayouts/CMakeLists.txt
A		krita/data/windowlayouts/Cockpit (laptop mode).kwl
A		krita/data/windowlayouts/Dual screen editing.kwl
M		krita/main.cc
M		libs/flake/KoPathShape.cpp
M		libs/global/kis_assert.h
M		libs/image/CMakeLists.txt
V		libs/image/{KisDecoratedNodeInterface.cpp ← kis_spontaneous_job.cpp}
A		libs/image/KisDecoratedNodeInterface.h
M		libs/image/KisRecycleProjectionsJob.cpp
M		libs/image/KisRecycleProjectionsJob.h
M		libs/image/KisRunnableBasedStrokeStrategy.cpp
M		libs/image/KisRunnableBasedStrokeStrategy.h
M		libs/image/KisSafeNodeProjectionStore.cpp
M		libs/image/commands/kis_image_commands.h
D		libs/image/commands/kis_image_set_projection_color_space_command.cpp
D		libs/image/commands/kis_image_set_projection_color_space_command.h
M		libs/image/commands/kis_node_property_list_command.cpp
A		libs/image/commands_new/KisChangeChannelFlagsCommand.cpp
P		libs/image/commands_new/KisChangeChannelFlagsCommand.h Copied from plugins/tools/basictools/KisMoveBoundsCalculationJob.h
A		libs/image/commands_new/KisChangeChannelLockFlagsCommand.cpp
A		libs/image/commands_new/KisChangeChannelLockFlagsCommand.h
M		libs/image/commands_new/kis_processing_command.cpp
M		libs/image/commands_new/kis_saved_commands.cpp
M		libs/image/commands_new/kis_saved_commands.h
M		libs/image/kis_abstract_projection_plane.cpp
M		libs/image/kis_abstract_projection_plane.h
M		libs/image/kis_cached_paint_device.h
D		libs/image/kis_change_profile_visitor.h
M		libs/image/kis_clone_layer.cpp
M		libs/image/kis_clone_layer.h
D		libs/image/kis_colorspace_convert_visitor.cpp
D		libs/image/kis_colorspace_convert_visitor.h
M		libs/image/kis_default_bounds.cpp
M		libs/image/kis_default_bounds.h
M		libs/image/kis_default_bounds_base.h
M		libs/image/kis_do_something_command.h
M		libs/image/kis_external_layer_iface.h
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_layer.cc
M		libs/image/kis_layer.h
M		libs/image/kis_layer_projection_plane.cpp
M		libs/image/kis_layer_projection_plane.h
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_layer_utils.h
M		libs/image/kis_mask_projection_plane.cpp
M		libs/image/kis_mask_projection_plane.h
M		libs/image/kis_onion_skin_cache.cpp
M		libs/image/kis_paint_device.cc
M		libs/image/kis_paint_device.h
M		libs/image/kis_paint_device_data.h
M		libs/image/kis_paint_layer.cc
M		libs/image/kis_paint_layer.h
M		libs/image/kis_processing_applicator.cpp
M		libs/image/kis_processing_applicator.h
M		libs/image/kis_recalculate_generator_layer_job.cpp
M		libs/image/kis_recalculate_generator_layer_job.h
M		libs/image/kis_recalculate_transform_mask_job.cpp
M		libs/image/kis_recalculate_transform_mask_job.h
M		libs/image/kis_regenerate_frame_stroke_strategy.cpp
V		libs/image/{kis_runnable_with_debug_name.h ← tests/kis_change_profile_visitor_test.h}
M		libs/image/kis_selection.cc
M		libs/image/kis_selection.h
M		libs/image/kis_selection_mask.cpp
M		libs/image/kis_selection_mask.h
M		libs/image/kis_simple_stroke_strategy.cpp
M		libs/image/kis_simple_stroke_strategy.h
V		libs/image/{kis_spontaneous_job.cpp → KisDecoratedNodeInterface.cpp}
M		libs/image/kis_spontaneous_job.h
M		libs/image/kis_stroke_job.h
M		libs/image/kis_stroke_job_strategy.cpp
M		libs/image/kis_stroke_job_strategy.h
M		libs/image/kis_stroke_strategy.cpp
M		libs/image/kis_stroke_strategy.h
M		libs/image/kis_stroke_strategy_undo_command_based.cpp
M		libs/image/kis_stroke_strategy_undo_command_based.h
M		libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
M		libs/image/kis_switch_time_stroke_strategy.cpp
M		libs/image/kis_sync_lod_cache_stroke_strategy.cpp
M		libs/image/kis_transform_mask.cpp
M		libs/image/kis_update_job_item.h
M		libs/image/kis_update_outline_job.cpp
M		libs/image/kis_update_outline_job.h
M		libs/image/kis_update_selection_job.cpp
M		libs/image/kis_update_selection_job.h
M		libs/image/layerstyles/kis_layer_style_filter_projection_plane.cpp
M		libs/image/layerstyles/kis_layer_style_filter_projection_plane.h
M		libs/image/layerstyles/kis_layer_style_projection_plane.cpp
M		libs/image/layerstyles/kis_layer_style_projection_plane.h
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/lazybrush/kis_colorize_mask.h
M		libs/image/lazybrush/kis_colorize_stroke_strategy.cpp
A		libs/image/processing/kis_assign_profile_processing_visitor.cpp
A		libs/image/processing/kis_assign_profile_processing_visitor.h
A		libs/image/processing/kis_convert_color_space_processing_visitor.cpp
A		libs/image/processing/kis_convert_color_space_processing_visitor.h
M		libs/image/tests/CMakeLists.txt
D		libs/image/tests/kis_change_profile_visitor_test.cpp
V		libs/image/{tests/kis_change_profile_visitor_test.h → kis_runnable_with_debug_name.h}
D		libs/image/tests/kis_colorspace_convert_visitor_test.cpp
D		libs/image/tests/kis_colorspace_convert_visitor_test.h
M		libs/image/tests/kis_image_test.cpp
M		libs/image/tests/kis_image_test.h
M		libs/image/tests/kis_paint_device_test.cpp
M		libs/image/tests/kis_simple_stroke_strategy_test.cpp
M		libs/image/tests/kis_strokes_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/scheduler_utils.h
M		libs/image/tiles3/kis_lockless_stack.h
M		libs/image/tiles3/kis_tile_hash_table2.h
M		libs/koplugin/KoPluginLoader.h
M		libs/libkis/Document.cpp
M		libs/libkis/Node.cpp
M		libs/pigment/KoColorProfile.h
M		libs/pigment/resources/KoColorSet.cpp
M		libs/pigment/resources/KoColorSet.h
M		libs/ui/KisCloneDocumentStroke.cpp
M		libs/ui/KisDecorationsWrapperLayer.cpp
M		libs/ui/KisDecorationsWrapperLayer.h
M		libs/ui/KisDocument.cpp
M		libs/ui/KisImportExportManager.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/canvas/kis_display_color_converter.cpp
M		libs/ui/dialogs/kis_dlg_image_properties.cc
M		libs/ui/dialogs/kis_dlg_image_properties.h
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/dialogs/kis_dlg_preferences.h
M		libs/ui/flake/KisReferenceImagesLayer.cpp
M		libs/ui/flake/KisReferenceImagesLayer.h
M		libs/ui/flake/kis_node_dummies_graph.cpp
M		libs/ui/flake/kis_node_dummies_graph.h
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_selection.cpp
M		libs/ui/flake/kis_shape_selection_model.cpp
M		libs/ui/flake/kis_take_all_shapes_command.cpp
M		libs/ui/flake/kis_take_all_shapes_command.h
M		libs/ui/forms/wdgimageproperties.ui
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_file_layer.cpp
M		libs/ui/kis_file_layer.h
M		libs/ui/kis_image_manager.cc
M		libs/ui/kis_model_index_converter.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_png_converter.cpp
M		libs/ui/kis_statusbar.cc
M		libs/ui/tests/kis_shape_selection_test.cpp
M		libs/ui/tests/kis_shape_selection_test.h
M		libs/ui/tool/strokes/freehand_stroke.cpp
M		libs/ui/tool/strokes/kis_color_picker_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_painter_based_stroke_strategy.h
M		libs/ui/tool/strokes/move_stroke_strategy.cpp
M		libs/ui/widgets/kis_preset_live_preview_view.cpp
M		libs/ui/widgets/kis_scratch_pad.cpp
M		libs/widgets/KoResourceTaggingManager.cpp
M		libs/widgets/kis_color_button.cpp
M		libs/widgetutils/KoFileDialog.cpp
M		packaging/linux/flatpak/org.kde.krita-nightly.yaml
M		packaging/linux/flatpak/org.kde.krita-stable.yaml
M		packaging/macos/osxdeploy.sh
M		plugins/assistants/Assistants/ConcentricEllipseAssistant.h
M		plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
M		plugins/dockers/advancedcolorselector/kis_color_selector_base.h
M		plugins/dockers/animation/tests/timeline_model_test.cpp
M		plugins/dockers/animation/tests/timeline_model_test.h
M		plugins/dockers/animation/timeline_docker.cpp
M		plugins/dockers/animation/timeline_frames_index_converter.cpp
M		plugins/dockers/animation/timeline_frames_index_converter.h
M		plugins/dockers/animation/timeline_frames_model.cpp
M		plugins/dockers/animation/timeline_frames_model.h
M		plugins/dockers/animation/timeline_node_list_keeper.cpp
M		plugins/dockers/animation/timeline_node_list_keeper.h
M		plugins/dockers/overview/overviewwidget.cc
M		plugins/extensions/animationrenderer/AnimationRenderer.cpp
M		plugins/extensions/colorspaceconversion/colorspaceconversion.cc
M		plugins/impex/CMakeLists.txt
D		plugins/impex/csv/tests/data/writeonlyFile.txt
M		plugins/impex/jp2/CMakeLists.txt
M		plugins/impex/jp2/krita_jp2.desktop
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_loader.cpp
M		plugins/impex/libkra/kis_kra_savexml_visitor.cpp
M		plugins/impex/psd/psd_resource_section.cpp
M		plugins/impex/psd/psd_saver.cpp
M		plugins/paintops/defaultpaintops/brush/KisDabRenderingJob.cpp
M		plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
M		plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
M		plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
M		plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
M		plugins/paintops/libpaintop/kis_brush_selection_widget.h
M		plugins/paintops/libpaintop/kis_compositeop_option.cpp
M		plugins/paintops/libpaintop/kis_dab_cache_base.cpp
M		plugins/paintops/libpaintop/kis_precision_option.cpp
M		plugins/paintops/libpaintop/kis_precision_option.h
M		plugins/paintops/libpaintop/kis_text_brush_chooser.cpp
M		plugins/paintops/libpaintop/kis_text_brush_chooser.h
M		plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
M		plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
M		plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
M		plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
M		plugins/python/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/tools/basictools/KisMoveBoundsCalculationJob.cpp
P		plugins/tools/basictools/KisMoveBoundsCalculationJob.h Copied to libs/image/commands_new/KisChangeChannelFlagsCommand.h
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/basictools/kis_tool_move.h
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
M		plugins/tools/selectiontools/KisToolSelectMagnetic.cc
M		plugins/tools/svgtexttool/SvgTextEditor.cpp
M		plugins/tools/svgtexttool/kis_font_family_combo_box.cpp
M		plugins/tools/svgtexttool/kis_font_family_combo_box.h
M		plugins/tools/tool_polygon/kis_tool_polygon.cc
M		plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/kis_tool_transform.h
M		plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
M		plugins/tools/tool_transform2/kis_tool_transform_config_widget.h
M		plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_warp_transform_strategy.h
M		plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
M		plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
M		plugins/tools/tool_transform2/wdg_tool_transform.ui
M		sdk/tests/filestest.h
M		sdk/tests/lod_override.h
M		sdk/tests/testing_timed_default_bounds.h