Diffusion Krita 796fc2ee593b

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim
796fc2ee593b
Actions

Authored by vanyossi on Jul 28 2018, 7:09 PM.

Description

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim

Details

Committed

vanyossi

Jul 28 2018, 7:09 PM

Parents

R37:ff83ebb73821: Reduce difference gap of Default Rect Mask Vector impl
R37:a87835636c36: Add a hidden config option to lock all dockers in place

Branches

Unknown

Tags

Unknown

vanyossi committed R37:796fc2ee593b: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jul 28 2018, 7:09 PM

Merged Changes

Commit	Author	Details	Committed
a87835636c36	rempt	Add a hidden config option to lock all dockers in place	Jul 28 2018
b19d73f81567	rempt	Fix kisdoc2test by using KISTEST_MAIN	Jul 28 2018
f2fe7dafb514	rempt	Fix KisAnimationExporterTest with KISMAIN_TEST	Jul 28 2018
6e016a2a8813	rempt	Fix loading the template icons	Jul 28 2018
34c8d0112acf	rempt	Fix the embedded pattern manager test	Jul 27 2018
469d92e72890	rempt	Fix some of the embedded pattern manager tests	Jul 27 2018
ba8ddf3af62a	rempt	Remove unused virtual declaration	Jul 27 2018
1c90443d5aa9	rempt	Also calculate the md5 sum if there isn't a resource on disk	Jul 27 2018
1c57cbeeee38	dkazakov	Fix KisTiffTest	Jul 27 2018
b74e6a5d8fb2	dkazakov	Fix KisSvgTest	Jul 27 2018
edea6b531ec8	dkazakov	Disable GUI tests KisNodeViewTest by default	Jul 27 2018
2294fee5f949	dkazakov	Fix deadlock when calling node juggler from the GUI thread	Jul 27 2018
e6d42eed8c40	dkazakov	Fix assert in KisDocumentTest	Jul 27 2018
657fa75c2f3f	dkazakov	Fix compilation	Jul 27 2018
5530f6518875	dkazakov	Fix TestSvgTextRoundTrip when no hindi font is found	Jul 27 2018
2d8f882ce880	dkazakov	Add more debugging for TestSvgText	Jul 27 2018
3c2620cddf6a	dkazakov	Fix half of KisColorizeMaskTest	Jul 27 2018
5af6c30cae5b	dkazakov	Fix KisPerspectiveTransformWorkerTest	Jul 27 2018
58195a7480ac	dkazakov	Update reference images for QImageBasedTest	Jul 27 2018
8486c324b475	dkazakov	Fix KisWalkersTest	Jul 27 2018
0f6ef2f98eb4	dkazakov	Recover the tests that were considered to depend on kritaui	Jul 27 2018
e7b6c7013084	dkazakov	Revert "Move tests that need kritaui to libs/ui/tests"	Jul 27 2018
4620a481f6db	rempt	Check pointer before dereferencing.	Jul 27 2018
e97a0a018ac8	rempt	Fix TestAnimatedTransformParameters	Jul 27 2018
33efeca4934e	rempt	Fix the prefix for the transform tool tests	Jul 27 2018
188c4b468f9b	dkazakov	Fix the name of Hide Safe Asserts feature	Jul 27 2018
3aa26c9878c7	dkazakov	Implement LIMIT_LONG_TESTS cmake option to limit tests on CI	Jul 27 2018

Changes (59)

				Path	Packages
	M			CMakeLists.txt
	A			config-limit-long-tests.h.cmake
	M			libs/flake/tests/TestSvgText.cpp
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/kis_async_merger_test.cpp
	M			libs/image/tests/kis_colorize_mask_test.cpp
	V			libs/{image ← ui}/tests/kis_cs_conversion_test.cpp
	V			libs/{image ← ui}/tests/kis_cs_conversion_test.h
	V			libs/{image ← ui}/tests/kis_dom_utils_test.cpp
	V			libs/{image ← ui}/tests/kis_dom_utils_test.h
	V			libs/{image ← ui}/tests/kis_image_animation_interface_test.cpp
	V			libs/{image ← ui}/tests/kis_image_animation_interface_test.h
	M			libs/image/tests/kis_mask_similarity_test.cpp
	V			libs/{image ← ui}/tests/kis_onion_skin_compositor_test.cpp
	V			libs/{image ← ui}/tests/kis_onion_skin_compositor_test.h
	V			libs/{image ← ui}/tests/kis_perspective_transform_worker_test.cpp
	V			libs/{image ← ui}/tests/kis_perspective_transform_worker_test.h
	V			libs/{image ← ui}/tests/kis_processings_test.cpp
	V			libs/{image ← ui}/tests/kis_processings_test.h
	V			libs/{image ← ui}/tests/kis_transform_worker_test.cpp
	V			libs/{image ← ui}/tests/kis_transform_worker_test.h
	M			libs/image/tests/kis_walkers_test.cpp
	M			libs/pigment/resources/KoResource.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/kis_node_juggler_compressed.cpp
	M			libs/ui/tests/CMakeLists.txt
	M			libs/ui/tests/kis_animation_exporter_test.cpp
	V			libs/{ui → image}/tests/kis_cs_conversion_test.cpp
	V			libs/{ui → image}/tests/kis_cs_conversion_test.h
	M			libs/ui/tests/kis_doc2_test.cpp
	V			libs/{ui → image}/tests/kis_dom_utils_test.cpp
	V			libs/{ui → image}/tests/kis_dom_utils_test.h
	V			libs/{ui → image}/tests/kis_image_animation_interface_test.cpp
	V			libs/{ui → image}/tests/kis_image_animation_interface_test.h
	M			libs/ui/tests/kis_node_view_test.cpp
	V			libs/{ui → image}/tests/kis_onion_skin_compositor_test.cpp
	V			libs/{ui → image}/tests/kis_onion_skin_compositor_test.h
	V			libs/{ui → image}/tests/kis_perspective_transform_worker_test.cpp
	V			libs/{ui → image}/tests/kis_perspective_transform_worker_test.h
	V			libs/{ui → image}/tests/kis_processings_test.cpp
	V			libs/{ui → image}/tests/kis_processings_test.h
	V			libs/{ui → image}/tests/kis_transform_worker_test.cpp
	V			libs/{ui → image}/tests/kis_transform_worker_test.h
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgetutils/KoResourcePaths.cpp
	M			plugins/impex/kra/kra_converter.cpp
	M			plugins/impex/svg/tests/data/results/official_gnu.svg.png
	M			plugins/impex/tiff/tests/kis_tiff_test.cpp
	M			plugins/paintops/libpaintop/kis_embedded_pattern_manager.cpp
	M			plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
	M			plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.h
	M			plugins/tools/tool_transform2/tests/CMakeLists.txt
	M			plugins/tools/tool_transform2/tests/test_animated_transform_parameters.cpp
	M			sdk/tests/data/initial_with_selection/initial_with_selection_blur1_original.png
	M			sdk/tests/data/initial_with_selection/initial_with_selection_blur1_projection.png
	M			sdk/tests/data/initial_with_selection/initial_with_selection_root_original.png
	M			sdk/tests/data/initial_with_selection/initial_with_selection_root_projection.png
	M			sdk/tests/qimage_based_test.h