Diffusion Krita 713edc5f44e7

Merge branch 'master' into rempt/T379-resource-management
713edc5f44e7
Actions

Authored by rempt on Aug 29 2019, 7:42 AM.

Description

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

Details

Committed

rempt

Aug 29 2019, 7:42 AM

Parents

R37:c0993bf6c80e: Fix spelling of "Gauss" in the High Pass filter
R37:b8424953892a: Merge branch 'master' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

References

refs/keep-around/713edc5f44e751d37dff09243a956fb114f95a91

rempt committed R37:713edc5f44e7: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Aug 29 2019, 7:42 AM

Merged Changes

Commit	Author	Details	Committed
c0993bf6c80e	Manuel Zeidler	Fix spelling of "Gauss" in the High Pass filter	Aug 28 2019
4613587dfa5d	dkazakov	Fix a possible crash in SimpleJobCoordinator during migrations	Aug 28 2019
c9c4ac82d70d	dkazakov	Fix crash when painting in SimpleJobCoordinator	Aug 28 2019
88e93b906b55	rempt	Set angle as the preferred renderer on Windows	Aug 28 2019
4a8019730016	dkazakov	Fix a deadlock in KoShapeManager::paint()	Aug 27 2019
4bc90d4f6f93	rempt	Try harder to copy the icon	Aug 27 2019
cfcf57cc542f	rempt	Try to find the appicon	Aug 27 2019
cd8aba9d8532	rempt	Another try to fix the appimage build	Aug 27 2019
e542b735b559	rempt	Fix the initial location for the ocio profile selector	Aug 27 2019
bb2710664882	rempt	BUG:411101 Make it possible to save group layers to file layers again	Aug 27 2019
50e6cf2178a0	rempt	Try to figure out where sip.so went to	Aug 27 2019
7ec84e5c194d	rempt	Do not crash when trying to merge an invisible group	Aug 27 2019
54be887098ab	rempt	Sip moved around? Let's try the appimage build again	Aug 27 2019
2769c21cd732	rempt	Remove obsolete checks for versions of Qt < 5.9	Aug 27 2019
51dfe74a4bd7	rempt	More appimage debug	Aug 27 2019
4d95c23c6ef8	rempt	Debug the appimage script some more	Aug 27 2019
c333d4bb5818	rempt	Remove checks for Qt < 5.9	Aug 27 2019

Changes (48)

		Path
M		CMakeLists.txt
M		krita/main.cc
M		libs/flake/KoImageData.cpp
M		libs/flake/KoShapeManager.cpp
M		libs/flake/text/KoSvgTextShape.cpp
M		libs/global/kis_debug.h
M		libs/image/kis_fixed_paint_device.cpp
M		libs/image/kis_layer_utils.cpp
M		libs/image/tiles3/kis_tile_data_store.cc
M		libs/image/tiles3/kis_tile_hash_table2.h
M		libs/libkis/tests/TestDocument.cpp
M		libs/libkis/tests/TestNode.cpp
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/dialogs/kis_dlg_image_properties.cc
M		libs/ui/input/kis_input_manager_p.cpp
M		libs/ui/kis_layer_manager.cc
M		libs/ui/kis_node_manager.cpp
M		libs/ui/widgets/KisScreenColorPicker.cpp
M		libs/widgets/KoDialog.cpp
M		libs/widgets/KoDialog.h
M		libs/widgets/KoDialog_p.h
M		libs/widgetutils/KisSqueezedComboBox.cpp
M		libs/widgetutils/config/krecentfilesaction.cpp
M		packaging/linux/appimage/build-image.sh
M		plugins/dockers/channeldocker/channelmodel.cpp
M		plugins/dockers/lut/lutdocker_dock.cpp
M		plugins/filters/CMakeLists.txt
A	(dir)	plugins/filters/gaussianhighpass/
A		plugins/filters/gaussianhighpass/CMakeLists.txt
V		plugins/filters/{gaussianhighpass/gaussianhighpass.cpp ← guassianhighpass/guassianhighpass.cpp}
V		plugins/filters/{gaussianhighpass/gaussianhighpass.h ← guassianhighpass/guassianhighpass.h}
V		plugins/filters/{gaussianhighpass/gaussianhighpass_filter.cpp ← guassianhighpass/guassianhighpass_filter.cpp}
V		plugins/filters/{gaussianhighpass/gaussianhighpass_filter.h ← guassianhighpass/guassianhighpass_filter.h}
V		plugins/filters/{gaussianhighpass/kritagaussianhighpassfilter.json ← guassianhighpass/kritaguassianhighpassfilter.json}
V		plugins/filters/{gaussianhighpass/wdg_gaussianhighpass.cpp ← guassianhighpass/wdg_guassianhighpass.cpp}
V		plugins/filters/{gaussianhighpass/wdg_gaussianhighpass.h ← guassianhighpass/wdg_guassianhighpass.h}
V		plugins/filters/{gaussianhighpass/wdggaussianhighpass.ui ← guassianhighpass/wdgguassianhighpass.ui}
D		plugins/filters/guassianhighpass
D		plugins/filters/guassianhighpass/CMakeLists.txt
V		plugins/filters/{guassianhighpass/guassianhighpass.cpp → gaussianhighpass/gaussianhighpass.cpp}
V		plugins/filters/{guassianhighpass/guassianhighpass.h → gaussianhighpass/gaussianhighpass.h}
V		plugins/filters/{guassianhighpass/guassianhighpass_filter.cpp → gaussianhighpass/gaussianhighpass_filter.cpp}
V		plugins/filters/{guassianhighpass/guassianhighpass_filter.h → gaussianhighpass/gaussianhighpass_filter.h}
V		plugins/filters/{guassianhighpass/kritaguassianhighpassfilter.json → gaussianhighpass/kritagaussianhighpassfilter.json}
V		plugins/filters/{guassianhighpass/wdg_guassianhighpass.cpp → gaussianhighpass/wdg_gaussianhighpass.cpp}
V		plugins/filters/{guassianhighpass/wdg_guassianhighpass.h → gaussianhighpass/wdg_gaussianhighpass.h}
V		plugins/filters/{guassianhighpass/wdgguassianhighpass.ui → gaussianhighpass/wdggaussianhighpass.ui}
M		plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp