From owner-svn-ports-all@freebsd.org  Sat May 30 14:51:10 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 749EE3341DC;
 Sat, 30 May 2020 14:51:10 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49Z4BQ2gQfz43FK;
 Sat, 30 May 2020 14:51:10 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56BE5A906;
 Sat, 30 May 2020 14:51:10 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04UEpAjo028177;
 Sat, 30 May 2020 14:51:10 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04UEpALn028176;
 Sat, 30 May 2020 14:51:10 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <202005301451.04UEpALn028176@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sat, 30 May 2020 14:51:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r537083 - head/graphics/krita/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tcberner
X-SVN-Commit-Paths: head/graphics/krita/files
X-SVN-Commit-Revision: 537083
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2020 14:51:10 -0000

Author: tcberner
Date: Sat May 30 14:51:10 2020
New Revision: 537083
URL: https://svnweb.freebsd.org/changeset/ports/537083

Log:
  graphics/krita: prepare for Qt5-5.15
  
  Obtained via gentoo.

Added:
  head/graphics/krita/files/patch-krita-4.2.9-qt5.15   (contents, props changed)

Added: head/graphics/krita/files/patch-krita-4.2.9-qt5.15
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/krita/files/patch-krita-4.2.9-qt5.15	Sat May 30 14:51:10 2020	(r537083)
@@ -0,0 +1,880 @@
+From d5bb12ac894ab8684d647bdf1559f745092dc741 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Mon, 23 Mar 2020 21:53:24 +0100
+Subject: Fix build with Qt 5.15
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+---
+ benchmarks/kis_stroke_benchmark.cpp                                     | 1 +
+ libs/basicflakes/tools/KoCreatePathTool_p.h                             | 2 ++
+ libs/brush/kis_auto_brush.cpp                                           | 1 +
+ libs/brush/kis_boundary.cc                                              | 1 +
+ libs/brush/kis_brush.cpp                                                | 1 +
+ libs/flake/KoClipMask.cpp                                               | 1 +
+ libs/flake/KoClipMaskPainter.cpp                                        | 1 +
+ libs/flake/KoConnectionShape.cpp                                        | 1 +
+ libs/flake/KoGradientBackground.cpp                                     | 1 +
+ libs/flake/KoHatchBackground.cpp                                        | 1 +
+ libs/flake/KoOdfGradientBackground.cpp                                  | 1 +
+ libs/flake/KoPathShape.cpp                                              | 1 +
+ libs/flake/KoPatternBackground.cpp                                      | 1 +
+ libs/flake/KoShapeManager.cpp                                           | 1 +
+ libs/flake/KoShapeShadow.cpp                                            | 1 +
+ libs/flake/KoSnapGuide.cpp                                              | 1 +
+ libs/flake/KoSnapStrategy.cpp                                           | 1 +
+ libs/flake/svg/SvgParser.cpp                                            | 1 +
+ libs/flake/tests/TestKoMarkerCollection.cpp                             | 1 +
+ libs/flake/tests/TestPointMergeCommand.cpp                              | 1 +
+ libs/flake/tests/TestShapeBackgroundCommand.cpp                         | 1 +
+ libs/flake/tests/TestSnapStrategy.cpp                                   | 1 +
+ libs/flake/tests/TestSvgParser.cpp                                      | 1 +
+ libs/flake/tests/TestSvgText.cpp                                        | 1 +
+ libs/flake/text/KoSvgTextChunkShape_p.h                                 | 1 +
+ libs/flake/text/KoSvgTextShape.cpp                                      | 1 +
+ libs/flake/tools/KoPathTool.cpp                                         | 1 +
+ libs/global/KisHandlePainterHelper.cpp                                  | 1 +
+ libs/image/brushengine/kis_paintop_settings.cpp                         | 1 +
+ libs/ui/flake/kis_shape_selection.h                                     | 2 ++
+ libs/ui/kis_painting_assistants_decoration.cpp                          | 1 +
+ libs/ui/kis_selection_decoration.h                                      | 1 +
+ libs/ui/tool/kis_shape_tool_helper.cpp                                  | 2 ++
+ libs/ui/tool/kis_tool_paint.h                                           | 1 +
+ libs/ui/widgets/kis_cie_tongue_widget.cpp                               | 1 +
+ libs/ui/widgets/kis_curve_widget.cpp                                    | 1 +
+ libs/ui/widgets/kis_tone_curve_widget.cpp                               | 1 +
+ plugins/assistants/Assistants/ConcentricEllipseAssistant.cc             | 1 +
+ plugins/assistants/Assistants/EllipseAssistant.cc                       | 1 +
+ plugins/assistants/Assistants/FisheyePointAssistant.cc                  | 1 +
+ plugins/assistants/Assistants/InfiniteRulerAssistant.cc                 | 1 +
+ plugins/assistants/Assistants/ParallelRulerAssistant.cc                 | 1 +
+ plugins/assistants/Assistants/PerspectiveAssistant.cc                   | 1 +
+ plugins/assistants/Assistants/RulerAssistant.cc                         | 1 +
+ plugins/assistants/Assistants/SplineAssistant.cc                        | 1 +
+ plugins/assistants/Assistants/VanishingPointAssistant.cc                | 1 +
+ plugins/assistants/Assistants/kis_assistant_tool.cc                     | 1 +
+ plugins/dockers/histogram/histogramdockerwidget.cpp                     | 1 +
+ plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp             | 2 ++
+ plugins/flake/textshape/TextShape.cpp                                   | 1 +
+ plugins/paintops/curvebrush/curve_brush.cpp                             | 2 ++
+ plugins/paintops/curvebrush/kis_curve_paintop.cpp                       | 1 +
+ plugins/paintops/experiment/kis_experiment_paintop.cpp                  | 2 ++
+ plugins/paintops/experiment/kis_experiment_paintop.h                    | 2 ++
+ plugins/tools/defaulttool/defaulttool/DefaultTool.cpp                   | 1 +
+ plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp            | 2 ++
+ .../karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp     | 1 +
+ .../tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h   | 1 +
+ plugins/tools/svgtexttool/SvgTextTool.cpp                               | 1 +
+ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp           | 1 +
+ plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp              | 2 ++
+ plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp        | 1 +
+ plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp    | 1 +
+ plugins/tools/tool_transform2/kis_transform_strategy_base.cpp           | 1 +
+ plugins/tools/tool_transform2/kis_transform_utils.cpp                   | 1 +
+ plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp           | 1 +
+ 66 files changed, 75 insertions(+)
+
+diff --git a/benchmarks/kis_stroke_benchmark.cpp b/benchmarks/kis_stroke_benchmark.cpp
+index 93296b2..1a2a4cc 100644
+--- benchmarks/kis_stroke_benchmark.cpp
++++ benchmarks/kis_stroke_benchmark.cpp
+@@ -26,6 +26,7 @@ inline double drand48()
+ }
+ #endif
+ 
++#include <QPainterPath>
+ #include <QTest>
+ 
+ #include "kis_stroke_benchmark.h"
+diff --git a/libs/basicflakes/tools/KoCreatePathTool_p.h b/libs/basicflakes/tools/KoCreatePathTool_p.h
+index 3864604..48f8a0c 100644
+--- libs/basicflakes/tools/KoCreatePathTool_p.h
++++ libs/basicflakes/tools/KoCreatePathTool_p.h
+@@ -22,6 +22,8 @@
+ #ifndef KOCREATEPATHTOOL_P_H
+ #define KOCREATEPATHTOOL_P_H
+ 
++#include <QPainterPath>
++
+ #include "KoCreatePathTool.h"
+ #include "KoPathPoint.h"
+ #include "KoPathPointData.h"
+diff --git a/libs/brush/kis_auto_brush.cpp b/libs/brush/kis_auto_brush.cpp
+index 67289b4..a0c59ac 100644
+--- libs/brush/kis_auto_brush.cpp
++++ libs/brush/kis_auto_brush.cpp
+@@ -24,6 +24,7 @@
+ #include <kis_debug.h>
+ #include <math.h>
+ 
++#include <QPainterPath>
+ #include <QRect>
+ #include <QDomElement>
+ #include <QtConcurrentMap>
+diff --git a/libs/brush/kis_boundary.cc b/libs/brush/kis_boundary.cc
+index a599d8e..5695428 100644
+--- libs/brush/kis_boundary.cc
++++ libs/brush/kis_boundary.cc
+@@ -18,6 +18,7 @@
+ 
+ #include "kis_boundary.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ 
+ #include "KoColorSpace.h"
+diff --git a/libs/brush/kis_brush.cpp b/libs/brush/kis_brush.cpp
+index 8a0f787..956635d 100644
+--- libs/brush/kis_brush.cpp
++++ libs/brush/kis_brush.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <QDomElement>
+ #include <QFile>
++#include <QPainterPath>
+ #include <QPoint>
+ #include <QFileInfo>
+ #include <QBuffer>
+diff --git a/libs/flake/KoClipMask.cpp b/libs/flake/KoClipMask.cpp
+index 8a21648..364d731 100644
+--- libs/flake/KoClipMask.cpp
++++ libs/flake/KoClipMask.cpp
+@@ -21,6 +21,7 @@
+ #include <QRectF>
+ #include <QTransform>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <KoShape.h>
+ #include "kis_algebra_2d.h"
+ 
+diff --git a/libs/flake/KoClipMaskPainter.cpp b/libs/flake/KoClipMaskPainter.cpp
+index 4fa456c..e7ea496 100644
+--- libs/flake/KoClipMaskPainter.cpp
++++ libs/flake/KoClipMaskPainter.cpp
+@@ -19,6 +19,7 @@
+ #include "KoClipMaskPainter.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRectF>
+ 
+ #include "kis_assert.h"
+diff --git a/libs/flake/KoConnectionShape.cpp b/libs/flake/KoConnectionShape.cpp
+index e8b5c80..d8dfee3 100644
+--- libs/flake/KoConnectionShape.cpp
++++ libs/flake/KoConnectionShape.cpp
+@@ -34,6 +34,7 @@
+ #include <KoXmlNS.h>
+ #include <KoUnit.h>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include <FlakeDebug.h>
+ 
+diff --git a/libs/flake/KoGradientBackground.cpp b/libs/flake/KoGradientBackground.cpp
+index 3f69791..0630d68 100644
+--- libs/flake/KoGradientBackground.cpp
++++ libs/flake/KoGradientBackground.cpp
+@@ -31,6 +31,7 @@
+ #include <QSharedPointer>
+ #include <QBrush>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ class KoGradientBackgroundPrivate : public KoShapeBackgroundPrivate
+ {
+diff --git a/libs/flake/KoHatchBackground.cpp b/libs/flake/KoHatchBackground.cpp
+index f556f12..23a0b48 100644
+--- libs/flake/KoHatchBackground.cpp
++++ libs/flake/KoHatchBackground.cpp
+@@ -36,6 +36,7 @@
+ #include <QColor>
+ #include <QString>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ class KoHatchBackgroundPrivate : public KoColorBackgroundPrivate
+ {
+diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradientBackground.cpp
+index 20f7aa7..3a90a8a 100644
+--- libs/flake/KoOdfGradientBackground.cpp
++++ libs/flake/KoOdfGradientBackground.cpp
+@@ -32,6 +32,7 @@
+ #include <KoOdfStylesReader.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QColor>
+ #include <QImage>
+ #include <qmath.h>
+diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
+index 2768a0e..9069877 100644
+--- libs/flake/KoPathShape.cpp
++++ libs/flake/KoPathShape.cpp
+@@ -50,6 +50,7 @@
+ 
+ #include <FlakeDebug.h>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "kis_global.h"
+ 
+diff --git a/libs/flake/KoPatternBackground.cpp b/libs/flake/KoPatternBackground.cpp
+index d98ecf8..46e3f80 100644
+--- libs/flake/KoPatternBackground.cpp
++++ libs/flake/KoPatternBackground.cpp
+@@ -37,6 +37,7 @@
+ 
+ #include <QBrush>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPointer>
+ 
+ class KoPatternBackgroundPrivate : public KoShapeBackgroundPrivate
+diff --git a/libs/flake/KoShapeManager.cpp b/libs/flake/KoShapeManager.cpp
+index 43bacd5..845c0bb 100644
+--- libs/flake/KoShapeManager.cpp
++++ libs/flake/KoShapeManager.cpp
+@@ -49,6 +49,7 @@
+ #include <QApplication>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include <FlakeDebug.h>
+ 
+diff --git a/libs/flake/KoShapeShadow.cpp b/libs/flake/KoShapeShadow.cpp
+index 2997590..df346d7 100644
+--- libs/flake/KoShapeShadow.cpp
++++ libs/flake/KoShapeShadow.cpp
+@@ -32,6 +32,7 @@
+ #include <KoViewConverter.h>
+ #include <FlakeDebug.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QAtomicInt>
+ #include <QImage>
+ #include <QRectF>
+diff --git a/libs/flake/KoSnapGuide.cpp b/libs/flake/KoSnapGuide.cpp
+index da7f770..0d8e5a9 100644
+--- libs/flake/KoSnapGuide.cpp
++++ libs/flake/KoSnapGuide.cpp
+@@ -27,6 +27,7 @@
+ #include <KoCanvasBase.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include <math.h>
+ 
+diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
+index cab1d09..8b09b10 100644
+--- libs/flake/KoSnapStrategy.cpp
++++ libs/flake/KoSnapStrategy.cpp
+@@ -27,6 +27,7 @@
+ #include <KoViewConverter.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include <cmath>
+ 
+diff --git a/libs/flake/svg/SvgParser.cpp b/libs/flake/svg/SvgParser.cpp
+index 4f29f6f..44a90aa 100644
+--- libs/flake/svg/SvgParser.cpp
++++ libs/flake/svg/SvgParser.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include <QColor>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDir>
+ 
+ #include <KoShape.h>
+diff --git a/libs/flake/tests/TestKoMarkerCollection.cpp b/libs/flake/tests/TestKoMarkerCollection.cpp
+index de05a13..ac9f570 100644
+--- libs/flake/tests/TestKoMarkerCollection.cpp
++++ libs/flake/tests/TestKoMarkerCollection.cpp
+@@ -21,6 +21,7 @@
+ #include <QTest>
+ #include <QFileInfo>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <KoMarker.h>
+ #include <KoMarkerCollection.h>
+ #include <KoPathShape.h>
+diff --git a/libs/flake/tests/TestPointMergeCommand.cpp b/libs/flake/tests/TestPointMergeCommand.cpp
+index ee6c647..c6b078e 100644
+--- libs/flake/tests/TestPointMergeCommand.cpp
++++ libs/flake/tests/TestPointMergeCommand.cpp
+@@ -23,6 +23,7 @@
+ #include "KoPathPoint.h"
+ #include "KoPathPointData.h"
+ #include <sdk/tests/kistest.h>
++#include <QPainterPath>
+ #include <QTest>
+ #include <FlakeDebug.h>
+ 
+diff --git a/libs/flake/tests/TestShapeBackgroundCommand.cpp b/libs/flake/tests/TestShapeBackgroundCommand.cpp
+index a3a44cd..a8a8c16 100644
+--- libs/flake/tests/TestShapeBackgroundCommand.cpp
++++ libs/flake/tests/TestShapeBackgroundCommand.cpp
+@@ -24,6 +24,7 @@
+ #include "KoShapePaintingContext.h"
+ #include "KoViewConverter.h"
+ 
++#include <QPainterPath>
+ #include <QTest>
+ 
+ void TestShapeBackgroundCommand::refCounting()
+diff --git a/libs/flake/tests/TestSnapStrategy.cpp b/libs/flake/tests/TestSnapStrategy.cpp
+index 8df1995..70342dc 100644
+--- libs/flake/tests/TestSnapStrategy.cpp
++++ libs/flake/tests/TestSnapStrategy.cpp
+@@ -18,6 +18,7 @@
+ */
+ 
+ #include "TestSnapStrategy.h"
++#include <QPainterPath>
+ #include <QTest>
+ #include "KoSnapStrategy.h"
+ #include "KoPathShape.h"
+diff --git a/libs/flake/tests/TestSvgParser.cpp b/libs/flake/tests/TestSvgParser.cpp
+index b03ac84..f8e748b 100644
+--- libs/flake/tests/TestSvgParser.cpp
++++ libs/flake/tests/TestSvgParser.cpp
+@@ -19,6 +19,7 @@
+ #include "TestSvgParser.h"
+ 
+ 
++#include <QPainterPath>
+ #include <QTest>
+ #include <svg/SvgUtil.h>
+ #include <KoShapeStrokeModel.h>
+diff --git a/libs/flake/tests/TestSvgText.cpp b/libs/flake/tests/TestSvgText.cpp
+index d2bb6bd..da81be0 100644
+--- libs/flake/tests/TestSvgText.cpp
++++ libs/flake/tests/TestSvgText.cpp
+@@ -768,6 +768,7 @@ void TestSvgText::testRightToLeft()
+ 
+ #include <QTextLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ void TestSvgText::testQtBidi()
+ {
+diff --git a/libs/flake/text/KoSvgTextChunkShape_p.h b/libs/flake/text/KoSvgTextChunkShape_p.h
+index 8c59d96..a9fd5c5 100644
+--- libs/flake/text/KoSvgTextChunkShape_p.h
++++ libs/flake/text/KoSvgTextChunkShape_p.h
+@@ -21,6 +21,7 @@
+ #include "KoSvgText.h"
+ #include "KoSvgTextProperties.h"
+ #include <KoShapeContainer_p.h>
++#include <QPainterPath>
+ #include <QTextCharFormat>
+ 
+ class SvgGraphicsContext;
+diff --git a/libs/flake/text/KoSvgTextShape.cpp b/libs/flake/text/KoSvgTextShape.cpp
+index 45b9459..8fd5774 100644
+--- libs/flake/text/KoSvgTextShape.cpp
++++ libs/flake/text/KoSvgTextShape.cpp
+@@ -48,6 +48,7 @@
+ #include <vector>
+ #include <memory>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <boost/optional.hpp>
+ 
+ #include <text/KoSvgTextChunkShapeLayoutInterface.h>
+diff --git a/libs/flake/tools/KoPathTool.cpp b/libs/flake/tools/KoPathTool.cpp
+index dae2d08..ce043a4 100644
+--- libs/flake/tools/KoPathTool.cpp
++++ libs/flake/tools/KoPathTool.cpp
+@@ -66,6 +66,7 @@
+ #include <FlakeDebug.h>
+ #include <klocalizedstring.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QBitmap>
+ #include <QTabWidget>
+ 
+diff --git a/libs/global/KisHandlePainterHelper.cpp b/libs/global/KisHandlePainterHelper.cpp
+index 7d66629..24b8137 100644
+--- libs/global/KisHandlePainterHelper.cpp
++++ libs/global/KisHandlePainterHelper.cpp
+@@ -19,6 +19,7 @@
+ #include "KisHandlePainterHelper.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include "kis_algebra_2d.h"
+ #include "kis_painting_tweaks.h"
+ 
+diff --git a/libs/image/brushengine/kis_paintop_settings.cpp b/libs/image/brushengine/kis_paintop_settings.cpp
+index 87f5c53..0e43fc9 100644
+--- libs/image/brushengine/kis_paintop_settings.cpp
++++ libs/image/brushengine/kis_paintop_settings.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include <QImage>
+ #include <QColor>
++#include <QPainterPath>
+ #include <QPointer>
+ 
+ #include <KoPointerEvent.h>
+diff --git a/libs/ui/flake/kis_shape_selection.h b/libs/ui/flake/kis_shape_selection.h
+index 3b2e853..805d5c6 100644
+--- libs/ui/flake/kis_shape_selection.h
++++ libs/ui/flake/kis_shape_selection.h
+@@ -18,6 +18,8 @@
+ #ifndef KIS_SHAPE_SELECTION_H
+ #define KIS_SHAPE_SELECTION_H
+ 
++#include <QPainterPath>
++
+ #include <KoShapeLayer.h>
+ #include <KoShapeFactoryBase.h>
+ #include <KoShapeUserData.h>
+diff --git a/libs/ui/kis_painting_assistants_decoration.cpp b/libs/ui/kis_painting_assistants_decoration.cpp
+index 11838e6..a0a684c 100644
+--- libs/ui/kis_painting_assistants_decoration.cpp
++++ libs/ui/kis_painting_assistants_decoration.cpp
+@@ -33,6 +33,7 @@
+ #include "KisViewManager.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ 
+ struct KisPaintingAssistantsDecoration::Private {
+diff --git a/libs/ui/kis_selection_decoration.h b/libs/ui/kis_selection_decoration.h
+index ea90ebb..557328d 100644
+--- libs/ui/kis_selection_decoration.h
++++ libs/ui/kis_selection_decoration.h
+@@ -19,6 +19,7 @@
+ #ifndef _KIS_SELECTION_DECORATION_H_
+ #define _KIS_SELECTION_DECORATION_H_
+ 
++#include <QPainterPath>
+ #include <QTimer>
+ #include <QPolygon>
+ #include <QPen>
+diff --git a/libs/ui/tool/kis_shape_tool_helper.cpp b/libs/ui/tool/kis_shape_tool_helper.cpp
+index 4edab2a..d914ff9 100644
+--- libs/ui/tool/kis_shape_tool_helper.cpp
++++ libs/ui/tool/kis_shape_tool_helper.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include "kis_shape_tool_helper.h"
+ 
++#include <QPainterPath>
++
+ #include <KoPathShape.h>
+ #include <KoShapeRegistry.h>
+ #include <KoShapeFactoryBase.h>
+diff --git a/libs/ui/tool/kis_tool_paint.h b/libs/ui/tool/kis_tool_paint.h
+index d3ea6f6..084fd10 100644
+--- libs/ui/tool/kis_tool_paint.h
++++ libs/ui/tool/kis_tool_paint.h
+@@ -22,6 +22,7 @@
+ #include "kis_tool.h"
+ 
+ #include <QGridLayout>
++#include <QPainterPath>
+ #include <QTimer>
+ #include <QCheckBox>
+ 
+diff --git a/libs/ui/widgets/kis_cie_tongue_widget.cpp b/libs/ui/widgets/kis_cie_tongue_widget.cpp
+index 79a8bfc..bbec19d 100644
+--- libs/ui/widgets/kis_cie_tongue_widget.cpp
++++ libs/ui/widgets/kis_cie_tongue_widget.cpp
+@@ -40,6 +40,7 @@ wavelength, and thus define the outline of the CIE "tongue" diagram.
+ 
+ #include <QPointF>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFile>
+ #include <QTimer>
+ #include <QPaintEvent>
+diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp
+index 1c5292d..09de36e 100644
+--- libs/ui/widgets/kis_curve_widget.cpp
++++ libs/ui/widgets/kis_curve_widget.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPoint>
+ #include <QPen>
+ #include <QEvent>
+diff --git a/libs/ui/widgets/kis_tone_curve_widget.cpp b/libs/ui/widgets/kis_tone_curve_widget.cpp
+index 679fed4..6eaca4b 100644
+--- libs/ui/widgets/kis_tone_curve_widget.cpp
++++ libs/ui/widgets/kis_tone_curve_widget.cpp
+@@ -25,6 +25,7 @@
+ #include <QPointF>
+ #include <QPolygonF>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QImage>
+ #include <cmath>
+diff --git a/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc b/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
+index 8c14b96..44078f3 100644
+--- plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
++++ plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
+@@ -23,6 +23,7 @@
+ #include <klocalizedstring.h>
+ #include "kis_debug.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ #include <kis_canvas2.h>
+diff --git a/plugins/assistants/Assistants/EllipseAssistant.cc b/plugins/assistants/Assistants/EllipseAssistant.cc
+index 8b3b16c..09d48fd 100644
+--- plugins/assistants/Assistants/EllipseAssistant.cc
++++ plugins/assistants/Assistants/EllipseAssistant.cc
+@@ -23,6 +23,7 @@
+ #include <klocalizedstring.h>
+ #include "kis_debug.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/FisheyePointAssistant.cc b/plugins/assistants/Assistants/FisheyePointAssistant.cc
+index 8338f4b..a5c0510 100644
+--- plugins/assistants/Assistants/FisheyePointAssistant.cc
++++ plugins/assistants/Assistants/FisheyePointAssistant.cc
+@@ -25,6 +25,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/InfiniteRulerAssistant.cc b/plugins/assistants/Assistants/InfiniteRulerAssistant.cc
+index 4fe1907..03da329 100644
+--- plugins/assistants/Assistants/InfiniteRulerAssistant.cc
++++ plugins/assistants/Assistants/InfiniteRulerAssistant.cc
+@@ -25,6 +25,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/ParallelRulerAssistant.cc b/plugins/assistants/Assistants/ParallelRulerAssistant.cc
+index 2deb3d3..405a172 100644
+--- plugins/assistants/Assistants/ParallelRulerAssistant.cc
++++ plugins/assistants/Assistants/ParallelRulerAssistant.cc
+@@ -25,6 +25,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/PerspectiveAssistant.cc b/plugins/assistants/Assistants/PerspectiveAssistant.cc
+index 46007b5..bcb2669 100644
+--- plugins/assistants/Assistants/PerspectiveAssistant.cc
++++ plugins/assistants/Assistants/PerspectiveAssistant.cc
+@@ -24,6 +24,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/RulerAssistant.cc b/plugins/assistants/Assistants/RulerAssistant.cc
+index 48cc15e..64f1772 100644
+--- plugins/assistants/Assistants/RulerAssistant.cc
++++ plugins/assistants/Assistants/RulerAssistant.cc
+@@ -23,6 +23,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/SplineAssistant.cc b/plugins/assistants/Assistants/SplineAssistant.cc
+index 20b19dd..dfbd872 100644
+--- plugins/assistants/Assistants/SplineAssistant.cc
++++ plugins/assistants/Assistants/SplineAssistant.cc
+@@ -23,6 +23,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/VanishingPointAssistant.cc b/plugins/assistants/Assistants/VanishingPointAssistant.cc
+index 3cae70d..dbc66be 100644
+--- plugins/assistants/Assistants/VanishingPointAssistant.cc
++++ plugins/assistants/Assistants/VanishingPointAssistant.cc
+@@ -25,6 +25,7 @@
+ #include <klocalizedstring.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QTransform>
+ 
+diff --git a/plugins/assistants/Assistants/kis_assistant_tool.cc b/plugins/assistants/Assistants/kis_assistant_tool.cc
+index 4cff446..37ac8ee 100644
+--- plugins/assistants/Assistants/kis_assistant_tool.cc
++++ plugins/assistants/Assistants/kis_assistant_tool.cc
+@@ -21,6 +21,7 @@
+ #include <kis_assistant_tool.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
+ #include <QStandardPaths>
+diff --git a/plugins/dockers/histogram/histogramdockerwidget.cpp b/plugins/dockers/histogram/histogramdockerwidget.cpp
+index 5c8e29d..83aa432 100644
+--- plugins/dockers/histogram/histogramdockerwidget.cpp
++++ plugins/dockers/histogram/histogramdockerwidget.cpp
+@@ -24,6 +24,7 @@
+ #include <algorithm>
+ #include <QTime>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <functional>
+ 
+ #include "KoChannelInfo.h"
+diff --git a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
+index 3c246c9..96d1892 100644
+--- plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
++++ plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
+@@ -30,6 +30,8 @@
+ #include "EnhancedPathHandle.h"
+ #include "EnhancedPathFormula.h"
+ 
++#include <QPainterPath>
++
+ #include <KoXmlNS.h>
+ #include <KoXmlWriter.h>
+ #include <KoXmlReader.h>
+diff --git a/plugins/flake/textshape/TextShape.cpp b/plugins/flake/textshape/TextShape.cpp
+index c06c799..5b2fd12 100644
+--- plugins/flake/textshape/TextShape.cpp
++++ plugins/flake/textshape/TextShape.cpp
+@@ -57,6 +57,7 @@
+ #include <QApplication>
+ #include <QFont>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ #include <QTextLayout>
+ 
+diff --git a/plugins/paintops/curvebrush/curve_brush.cpp b/plugins/paintops/curvebrush/curve_brush.cpp
+index 347cc31..82bc86b 100644
+--- plugins/paintops/curvebrush/curve_brush.cpp
++++ plugins/paintops/curvebrush/curve_brush.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include "curve_brush.h"
+ 
++#include <QPainterPath>
++
+ #include <KoColor.h>
+ #include <KoColorSpace.h>
+ 
+diff --git a/plugins/paintops/curvebrush/kis_curve_paintop.cpp b/plugins/paintops/curvebrush/kis_curve_paintop.cpp
+index 295ee55..ed68e3f 100644
+--- plugins/paintops/curvebrush/kis_curve_paintop.cpp
++++ plugins/paintops/curvebrush/kis_curve_paintop.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <cmath>
+ 
++#include <QPainterPath>
+ #include <QRect>
+ 
+ #include <kis_image.h>
+diff --git a/plugins/paintops/experiment/kis_experiment_paintop.cpp b/plugins/paintops/experiment/kis_experiment_paintop.cpp
+index 54764d8..7c429b4 100644
+--- plugins/paintops/experiment/kis_experiment_paintop.cpp
++++ plugins/paintops/experiment/kis_experiment_paintop.cpp
+@@ -22,6 +22,8 @@
+ 
+ #include <cmath>
+ 
++#include <QPainterPath>
++
+ #include <KoCompositeOpRegistry.h>
+ 
+ #include <kis_debug.h>
+diff --git a/plugins/paintops/experiment/kis_experiment_paintop.h b/plugins/paintops/experiment/kis_experiment_paintop.h
+index 19dec9b..27f4fe3 100644
+--- plugins/paintops/experiment/kis_experiment_paintop.h
++++ plugins/paintops/experiment/kis_experiment_paintop.h
+@@ -19,6 +19,8 @@
+ #ifndef KIS_EXPERIMENT_PAINTOP_H_
+ #define KIS_EXPERIMENT_PAINTOP_H_
+ 
++#include <QPainterPath>
++
+ #include <klocalizedstring.h>
+ #include <brushengine/kis_paintop.h>
+ #include <kis_types.h>
+diff --git a/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp b/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
+index de2787f..363025e 100644
+--- plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
++++ plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
+@@ -67,6 +67,7 @@
+ 
+ #include <KoIcon.h>
+ 
++#include <QPainterPath>
+ #include <QPointer>
+ #include <QAction>
+ #include <QKeyEvent>
+diff --git a/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp b/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
+index 2c8c7db..ab560d6 100644
+--- plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
++++ plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
+@@ -21,6 +21,8 @@
+ 
+ #include "SelectionDecorator.h"
+ 
++#include <QPainterPath>
++
+ #include <KoShape.h>
+ #include <KoSelection.h>
+ #include <KoResourcePaths.h>
+diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
+index 2a461cb..1b9d81b 100644
+--- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
++++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include <QDebug>
+ #include <QColor>
++#include <QPainterPath>
+ 
+ #include <cmath>
+ #include <cstdlib>
+diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
+index 5bf3a8d..e2329d1 100644
+--- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
++++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
+@@ -22,6 +22,7 @@
+ 
+ #include <KoToolBase.h>
+ #include <KoPathShape.h>
++#include <QPainterPath>
+ #include <QPointer>
+ 
+ #include "KarbonCalligraphyOptionWidget.h"
+diff --git a/plugins/tools/svgtexttool/SvgTextTool.cpp b/plugins/tools/svgtexttool/SvgTextTool.cpp
+index b735ea7..91325f5 100644
+--- plugins/tools/svgtexttool/SvgTextTool.cpp
++++ plugins/tools/svgtexttool/SvgTextTool.cpp
+@@ -23,6 +23,7 @@
+ #include "SvgTextChangeCommand.h"
+ 
+ #include <QLabel>
++#include <QPainterPath>
+ #include <QToolButton>
+ #include <QGridLayout>
+ #include <QVBoxLayout>
+diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+index 9fd5578..6f5c298 100644
+--- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
++++ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QPointF>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMatrix4x4>
+ 
+ #include <KoResourcePaths.h>
+diff --git a/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp b/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
+index 93b0067..83b79d4 100644
+--- plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
++++ plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include "kis_liquify_paint_helper.h"
+ 
++#include <QPainterPath>
++
+ #include "kis_algebra_2d.h"
+ #include "KoPointerEvent.h"
+ #include <brushengine/kis_paint_information.h>
+diff --git a/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
+index 9662880..12d569b 100644
+--- plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
++++ plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <QPointF>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "KoPointerEvent.h"
+ 
+diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+index 0cff5ed..b74d986 100644
+--- plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
++++ plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QPointF>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMatrix4x4>
+ #include <QVector2D>
+ 
+diff --git a/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp b/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
+index 1e7603e..0671ed5 100644
+--- plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
++++ plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
+@@ -19,6 +19,7 @@
+ #include "kis_transform_strategy_base.h"
+ 
+ #include <QImage>
++#include <QPainterPath>
+ #include <QTransform>
+ #include "KoPointerEvent.h"
+ 
+diff --git a/plugins/tools/tool_transform2/kis_transform_utils.cpp b/plugins/tools/tool_transform2/kis_transform_utils.cpp
+index 1fbbd52..c7792f3 100644
+--- plugins/tools/tool_transform2/kis_transform_utils.cpp
++++ plugins/tools/tool_transform2/kis_transform_utils.cpp
+@@ -19,6 +19,7 @@
+ #include "kis_transform_utils.h"
+ 
+ #include <cmath>
++#include <QPainterPath>
+ #include <QTransform>
+ #include <KoUnit.h>
+ #include "tool_transform_args.h"
+diff --git a/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
+index fdad9f3..9a2dd4d 100644
+--- plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
++++ plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <QPointF>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "kis_coordinates_converter.h"
+ #include "tool_transform_args.h"
+-- 
+cgit v1.1
+