Diffusion Krita b4fe0614addc

Merge branch 'fix-build-with-qt-5.15' into 'krita/4.2'
b4fe0614addc
Actions

Authored by heikobecker on Mar 23 2020, 10:55 PM.

Description

Merge branch 'fix-build-with-qt-5.15' into 'krita/4.2'

Fix build with Qt 5.15

See merge request kde/krita!278

Details

Committed

heikobecker

Mar 23 2020, 10:55 PM

Parents

R37:d5bb12ac894a: Fix build with Qt 5.15
R37:33e7d7514ca3: Added ability to edit layers that are in isolation mode.

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/278/merge

heikobecker committed R37:b4fe0614addc: Merge branch 'fix-build-with-qt-5.15' into 'krita/4.2' (authored by heikobecker).Mar 23 2020, 10:55 PM

Merged Changes

	Commit			Author	Details	Committed
	d5bb12ac894a			heikobecker	Fix build with Qt 5.15	Mar 23 2020

Changes (66)

				Path	Packages
	M			benchmarks/kis_stroke_benchmark.cpp
	M			libs/basicflakes/tools/KoCreatePathTool_p.h
	M			libs/brush/kis_auto_brush.cpp
	M			libs/brush/kis_boundary.cc
	M			libs/brush/kis_brush.cpp
	M			libs/flake/KoClipMask.cpp
	M			libs/flake/KoClipMaskPainter.cpp
	M			libs/flake/KoConnectionShape.cpp
	M			libs/flake/KoGradientBackground.cpp
	M			libs/flake/KoHatchBackground.cpp
	M			libs/flake/KoOdfGradientBackground.cpp
	M			libs/flake/KoPathShape.cpp
	M			libs/flake/KoPatternBackground.cpp
	M			libs/flake/KoShapeManager.cpp
	M			libs/flake/KoShapeShadow.cpp
	M			libs/flake/KoSnapGuide.cpp
	M			libs/flake/KoSnapStrategy.cpp
	M			libs/flake/svg/SvgParser.cpp
	M			libs/flake/tests/TestKoMarkerCollection.cpp
	M			libs/flake/tests/TestPointMergeCommand.cpp
	M			libs/flake/tests/TestShapeBackgroundCommand.cpp
	M			libs/flake/tests/TestSnapStrategy.cpp
	M			libs/flake/tests/TestSvgParser.cpp
	M			libs/flake/tests/TestSvgText.cpp
	M			libs/flake/text/KoSvgTextChunkShape_p.h
	M			libs/flake/text/KoSvgTextShape.cpp
	M			libs/flake/tools/KoPathTool.cpp
	M			libs/global/KisHandlePainterHelper.cpp
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/ui/flake/kis_shape_selection.h
	M			libs/ui/kis_painting_assistants_decoration.cpp
	M			libs/ui/kis_selection_decoration.h
	M			libs/ui/tool/kis_shape_tool_helper.cpp
	M			libs/ui/tool/kis_tool_paint.h
	M			libs/ui/widgets/kis_cie_tongue_widget.cpp
	M			libs/ui/widgets/kis_curve_widget.cpp
	M			libs/ui/widgets/kis_tone_curve_widget.cpp
	M			plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
	M			plugins/assistants/Assistants/EllipseAssistant.cc
	M			plugins/assistants/Assistants/FisheyePointAssistant.cc
	M			plugins/assistants/Assistants/InfiniteRulerAssistant.cc
	M			plugins/assistants/Assistants/ParallelRulerAssistant.cc
	M			plugins/assistants/Assistants/PerspectiveAssistant.cc
	M			plugins/assistants/Assistants/RulerAssistant.cc
	M			plugins/assistants/Assistants/SplineAssistant.cc
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/dockers/histogram/histogramdockerwidget.cpp
	M			plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
	M			plugins/flake/textshape/TextShape.cpp
	M			plugins/paintops/curvebrush/curve_brush.cpp
	M			plugins/paintops/curvebrush/kis_curve_paintop.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop.h
	M			plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
	M			plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
	M			plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
	M			plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
	M			plugins/tools/svgtexttool/SvgTextTool.cpp
	M			plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
	M			plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
	M			plugins/tools/tool_transform2/kis_transform_utils.cpp
	M			plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp