Diffusion Krita cd8ca4d9ed2b

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

Authored by rempt on Jul 26 2018, 2:59 PM.

Description

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

Details

Committed

rempt

Jul 26 2018, 2:59 PM

Parents

R37:232df0a4c801: Fix KoResourceTaggingTest
R37:e9679ff9ac36: Fix merge error

Branches

Unknown

Tags

Unknown

rempt committed R37:cd8ca4d9ed2b: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Jul 26 2018, 2:59 PM

Merged Changes

Commit	Author	Details	Committed
232df0a4c801	rempt	Fix KoResourceTaggingTest	Jul 26 2018
87d07ec5e1d8	rempt	Remove duplicates	Jul 26 2018
fc23e986b106	rempt	Only look in the toplevel folder if there are no aliases	Jul 26 2018
3b76cd505a5c	rempt	Add the type we're trying to load to the warning about failed resource loads	Jul 26 2018
5ab1a3d141d1	rempt	Remove superfluous Q_ASSERT	Jul 26 2018
6ae5c55481bd	rempt	Only look for .input files, not everything	Jul 26 2018
d920d1d3b565	rempt	Fix KisExiv2Test with KISTEST_MAIN	Jul 26 2018
387c9fdb89f1	rempt	Move tests that need kritaui to libs/ui/tests	Jul 26 2018
75bebe3ca21d	dkazakov	Fix TestPointMergeCommand	Jul 26 2018
6b2f2f2bf0d3	rempt	Remove test for unsupported date format	Jul 26 2018
b59ed45b0039	rempt	debug--	Jul 26 2018
6fa9587f1167	rempt	Move the schemas to the data folder so tests can find them without installing	Jul 26 2018
6c801c76d59d	rempt	Also check for resources in extra_resource_dirs + alias	Jul 26 2018
c0e91569d64d	rempt	warning-- : mytool.json does not exist	Jul 26 2018

Changes (65)

		Path
M		krita/data/CMakeLists.txt
A	(dir)	krita/data/metadata/
A	(dir)	krita/data/metadata/schemas/
A		krita/data/metadata/schemas/CMakeLists.txt
V		{krita/data ← libs/image}/metadata/schemas/dc.schema
V		{krita/data ← libs/image}/metadata/schemas/exif.schema
V		{krita/data ← libs/image}/metadata/schemas/mkn.schema
V		{krita/data ← libs/image}/metadata/schemas/tiff.schema
V		{krita/data ← libs/image}/metadata/schemas/xmp.schema
V		{krita/data ← libs/image}/metadata/schemas/xmpmm.schema
V		{krita/data ← libs/image}/metadata/schemas/xmprights.schema
M		libs/flake/KoToolFactoryBase.h
M		libs/flake/tests/TestPointMergeCommand.cpp
M		libs/image/CMakeLists.txt
M		libs/image/metadata/kis_meta_data_entry.cc
M		libs/image/metadata/kis_meta_data_schema_registry.cc
M		libs/image/metadata/kis_meta_data_store.cc
D		libs/image/metadata/schemas
V		{libs/image → krita/data}/metadata/schemas/dc.schema
V		{libs/image → krita/data}/metadata/schemas/exif.schema
V		{libs/image → krita/data}/metadata/schemas/mkn.schema
V		{libs/image → krita/data}/metadata/schemas/tiff.schema
V		{libs/image → krita/data}/metadata/schemas/xmp.schema
V		{libs/image → krita/data}/metadata/schemas/xmpmm.schema
V		{libs/image → krita/data}/metadata/schemas/xmprights.schema
M		libs/image/tests/CMakeLists.txt
M		libs/image/tests/kis_async_merger_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_meta_data_test.cpp
M		libs/image/tests/kis_meta_data_test.h
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/resources/KoResourcePaths.cpp
M		libs/ui/input/kis_input_profile_manager.cpp
M		libs/ui/tests/CMakeLists.txt
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_derived_resources_test.cpp
V		libs/{ui ← image}/tests/kis_dom_utils_test.cpp
V		libs/{ui ← image}/tests/kis_dom_utils_test.h
M		libs/ui/tests/kis_exiv2_test.cpp
V		libs/{ui ← image}/tests/kis_image_animation_interface_test.cpp
V		libs/{ui ← image}/tests/kis_image_animation_interface_test.h
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/widgets/KisDlgInternalColorSelector.cpp
M		libs/widgets/KoResourceServer.h
M		libs/widgets/tests/KoResourceTaggingTest.cpp