Merge branch 'master' of invent.kde.org:kde/krita into recorder_plugin
08f0aad1cc45
Actions

Authored by shiyan on Jan 2 2020, 7:07 AM.

Description

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

Details

Committed

Jan 2 2020, 7:07 AM

Parents

R37:a000cfdce490: Merge branch 'debug2' into recorder_plugin
R37:3f0ff1a86c64: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

shiyan committed R37:08f0aad1cc45: Merge branch 'master' of invent.kde.org:kde/krita into recorder_plugin (authored by shiyan).Jan 2 2020, 7:07 AM

Merged Changes

Commit		Author	Details	Committed
3f0ff1a86c64		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 21 2019
f92e44bb2ef4		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 21 2019
d0ced0f1b478		Saurabh Kumar/tymond	Delete slotAddPalette as it was unconnected	Dec 19 2019
d25b10a4c25e		Saurabh Kumar/tymond	Prevent crash on addition of color to deleted palette with colorpicker	Dec 19 2019
ef55574a4af7		vanyossi	Fix PaletteDocker not showing palettes	Dec 19 2019
08e7240a6e77		vanyossi	macOS: Fix case sensitive include	Dec 16 2019
cf3682662b4d		tymond	Fix crash opening .kra with incorrect clone source	Dec 9 2019
0e62d4e2062c		nolanfa	README: update krita build instructions link	Dec 9 2019
8bc2965db842		jasperh	Fix comparison of double spin box	Dec 9 2019
818c841b0b20	D25739	broulik	[KisColorFilterCombo] Force ComboBox popup	Dec 5 2019
2dc2ed5f5a6b		dkazakov	Fix a crash when cancelling Transform Tool action	Dec 4 2019
2771cd992d2e		rempt	Split the log in sysinfo and session log	Dec 4 2019
465416bd00df		rempt	Don't leak a QFontComboBox	Dec 4 2019
2c57fdf0b67d		rempt	Remove KoFontComboBox	Dec 4 2019
71063ae375ca		rempt	Remove useless calls to QApplication::globalStrut	Dec 4 2019
f9e85f483639		rempt	Give removing the json files a try...	Dec 4 2019
011726bf5114		rempt	Add a json file for the stable flatpak build	Dec 4 2019
b434751233e9		vanyossi	Fix 1px brush offset in line tool	Dec 4 2019
f2419f5af198		tymond	Increase the limit in Layer Offset to 100k	Dec 3 2019
089a28f96c0d		tymond	Fix crash using onion skins on non-animated layers	Dec 2 2019
b49d97897559		tymond	Fix Grow Selection expanding in one direction	Dec 2 2019
d4dfd7b6777b		yurchor	Update URLs	Dec 2 2019
f923297a45a3		yurchor	Use URL with transport encryption	Dec 1 2019
a650be159007		lvsouza	Merge branch 'master' into…	Dec 1 2019
97c03e0f3314		lvsouza	Fix crash when starting Krita with Qt compiled in debug mode.	Nov 30 2019
fcb5c280af2d		hellozee	Fix segfault while opening text with double click	Nov 30 2019
71ca2f24e832		rempt	BUG 414550: Fix an obviously wrong assert	Nov 29 2019
5924da497247		Merlijn Sebrechts/rempt	[snap] upgrade to 4.2.8.2 and use metadata from appstream	Nov 28 2019
dea9c67c4272		shiyan/rempt	fix build break caused qComapre QRect and QRectF	Nov 27 2019

Changes (168)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			README.md
	M			krita/data/profiles/elles-icc-profiles/make-elles-profiles.c
	M			krita/data/templates/animation/.directory
	M			krita/main.cc
	M			krita/org.kde.krita.appdata.xml
	M			libs/command/kis_undo_store.h
	M			libs/command/kundo2magicstring.h
	M			libs/flake/KoCurveFit.h
	M			libs/flake/KoOdfWorkaround.h
	M			libs/flake/KoShapeAnchor.cpp
	M			libs/flake/KoShapeShadow.cpp
	M			libs/flake/svg/SvgUtil.cpp
	M			libs/flake/svg/SvgWriter.cpp
	M			libs/flake/text/KoSvgTextShapeMarkupConverter.h
	M			libs/global/KisUsageLogger.cpp
	M			libs/global/KisUsageLogger.h
	M			libs/global/kis_shared_ptr.h
	M			libs/image/brushengine/kis_paintop.cc
	M			libs/image/commands_new/kis_change_projection_color_command.cpp
	M			libs/image/kis_async_merger.cpp
	M			libs/image/kis_edge_detection_kernel.cpp
	M			libs/image/kis_fast_math.cpp
	M			libs/image/kis_fast_math.h
	M			libs/image/kis_onion_skin_compositor.cpp
	M			libs/image/kis_painter.cc
	M			libs/image/kis_properties_configuration.h
	M			libs/image/kis_psd_layer_style.h
	M			libs/image/kis_selection_filters.cpp
	M			libs/image/lazybrush/patched_boykov_kolmogorov_max_flow.hpp
	M			libs/image/tiles3/kis_lockless_stack.h
	M			libs/libkis/FillLayer.h
	M			libs/libkis/InfoObject.h
	M			libs/libkis/ManagedColor.h
	M			libs/odf/KoPageFormat.cpp
	M			libs/pigment/KoColor.h
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoLut.h
	M			libs/pigment/compositeops/KoCompositeOpFunctions.h
	M			libs/pigment/lut.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoSegmentGradient.cpp
	M			libs/pigment/tests/CCSGraph.cpp
	M			libs/psd/psd.h
	M			libs/ui/canvas/kis_canvas_widget_base.cpp
	M			libs/ui/input/wintab/kis_tablet_support_win_p.h
	M			libs/ui/kis_config.cc
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/osx.mm
	M			libs/ui/qtsingleapplication/qtlocalpeer.cpp
	M			libs/ui/qtsingleapplication/qtlocalpeer.h
	M			libs/ui/qtsingleapplication/qtsingleapplication.cpp
	M			libs/ui/qtsingleapplication/qtsingleapplication.h
	M			libs/ui/thememanager.cpp
	M			libs/ui/thememanager.h
	M			libs/ui/tool/kis_tool_freehand_helper.cpp
	M			libs/ui/utils/KisClipboardUtil.cpp
	M			libs/ui/widgets/kis_advanced_color_space_selector.cc
	M			libs/ui/widgets/kis_cmb_gradient.cpp
	M			libs/ui/widgets/kis_color_filter_combo.cpp
	M			libs/ui/widgets/kis_curve_widget.h
	M			libs/ui/widgets/kis_slider_spin_box.cpp
	M			libs/ui/widgets/kis_stopgradient_slider_widget.cpp
	M			libs/widgets/KisPaletteModel.cpp
	D			libs/widgets/KoFontComboBox.h
	M			libs/widgets/KoSliderCombo.cpp
	M			libs/widgets/kis_color_button.cpp
	M			libs/widgets/kis_color_input.cpp
	M			libs/widgetutils/KisSqueezedComboBox.cpp
	M			libs/widgetutils/config/kstandardaction.h
	M			libs/widgetutils/kis_double_parse_spin_box.cpp
	M			libs/widgetutils/xmlgui/kaboutkdedialog_p.cpp
	M			libs/widgetutils/xmlgui/kbugreport.cpp
	D			packaging/linux/flatpak/org.kde.krita-nightly.json
	M			packaging/linux/snap/build_in_container.sh
	M			packaging/linux/snap/snapcraft.yaml
	M			plugins/color/colorspaceextensions/kis_desaturate_adjustment.cpp
	M			plugins/dockers/layerdocker/NodeView.h
	M			plugins/dockers/lut/lutdocker_dock.cpp
	M			plugins/extensions/buginfo/dlg_buginfo.cpp
	M			plugins/extensions/offsetimage/wdg_offsetimage.ui
	M			plugins/extensions/pykrita/plugin/PythonPluginManager.cpp
	M			plugins/extensions/pykrita/plugin/utilities.cpp
	M			plugins/extensions/qmic/WdgQMicSettings.ui
	M			plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
	M			plugins/flake/textshape/FontFamilyAction.cpp
	M			plugins/flake/textshape/kotext/KoTextBlockData.cpp
	M			plugins/flake/textshape/kotext/KoVariable.cpp
	M			plugins/flake/textshape/kotext/styles/KoCharacterStyle.cpp
	M			plugins/flake/textshape/textlayout/KoTextDocumentLayout.cpp
	M			plugins/flake/textshape/textlayout/KoTextLayoutArea_paint.cpp
	M			plugins/flake/textshape/textlayout/ListItemsHelper.cpp
	M			plugins/impex/kra/kra_converter.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/psd/psd_additional_layer_info_block.h
	M			plugins/impex/psd/psd_layer_section.h
	M			plugins/impex/psd/psd_loader.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/AUTHORS
	M			plugins/impex/raw/3rdparty/libkdcraw/README
	M			plugins/impex/raw/3rdparty/libkdcraw/cmake/modules/FindLibRaw.cmake
	M			plugins/impex/raw/3rdparty/libkdcraw/cmake/templates/libkdcraw.pc.cmake
	M			plugins/impex/raw/3rdparty/libkdcraw/src/Mainpage.dox
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawinfocontainer.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawinfocontainer.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawsettingswidget.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawsettingswidget.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/ractionjob.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/ractionjob.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/ractionthreadbase.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/ractionthreadbase.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rawfiles.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rcombobox.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rcombobox.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rexpanderbox.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rexpanderbox.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rnuminput.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rnuminput.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rsliderspinbox.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rsliderspinbox.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rwidgetutils.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rwidgetutils.h
	M			plugins/impex/raw/3rdparty/libkdcraw/src/squeezedcombobox.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/squeezedcombobox.h
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/libinfo.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/multithreading/actionthread.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/multithreading/actionthread.h
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/multithreading/main.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/multithreading/processordlg.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/multithreading/processordlg.h
	M			plugins/impex/raw/3rdparty/libkdcraw/tests/raw2png.cpp
	M			plugins/impex/xcf/3rdparty/xcftools/utils.c
	M			plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_current_outline_fetcher.cpp
	M			plugins/paintops/libpaintop/kis_current_outline_fetcher.h
	M			plugins/paintops/sketch/kis_sketch_paintop.cpp
	M			plugins/paintops/tangentnormal/kis_tangent_tilt_option.cpp
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/exportlayers/kritapykrita_exportlayers.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/scripter/kritapykrita_scripter.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop
	M			plugins/tools/basictools/kis_tool_colorpicker.cc
	M			plugins/tools/basictools/kis_tool_colorpicker.h
	M			plugins/tools/basictools/kis_tool_line_helper.cpp
	M			plugins/tools/basictools/kis_tool_line_helper.h
	M			plugins/tools/svgtexttool/kis_font_family_combo_box.cpp
	M			plugins/tools/tool_transform2/kis_tool_transform.cc
	M			plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp