fix QPainterPath against Qt 5.15.0

Change-Id: I08aaf6886b04407f1e52ca4f56607c81fccec85c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

22 files changed, 27 insertions, 15 deletions

diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index b778441a70..92b89bfea5 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -54,6 +54,7 @@
 #include <QFont>
 #include <QPen>
 #include <QPainter>
+#include <QPainterPath>
 
 namespace qmt {
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
index 4705b9c5e1..bed283ec78 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
@@ -32,6 +32,7 @@
 
 QT_BEGIN_NAMESPACE
 class QGraphicsSimpleTextItem;
+class QPainterPath;
 QT_END_NAMESPACE
 
 namespace qmt {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
index 6f93a0d710..cb01e8cca9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
@@ -29,6 +29,7 @@
 
 QT_BEGIN_NAMESPACE
 class QGraphicsPathItem;
+class QPainterPath;
 QT_END_NAMESPACE
 
 namespace qmt {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 4b613c0465..937541f896 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -35,6 +35,7 @@
 #include <QBrush>
 #include <QLineF>
 #include <QPainter>
+#include <QPainterPath>
 #include <QKeyEvent>
 
 namespace qmt {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
index 3b8e1685fe..f65d34eae2 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
@@ -27,6 +27,8 @@
 
 #include <QGraphicsItem>
 
+QT_FORWARD_DECLARE_CLASS(QPainterPath)
+
 namespace qmt {
 
 class IWindable;
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index d781288557..a794b337a0 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -30,7 +30,6 @@
 
 #include <QGraphicsPixmapItem>
 #include <QGraphicsScene>
-#include <QPainterPath>
 #include <QPropertyAnimation>
 #include <QSequentialAnimationGroup>
 
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index c4a1f822b1..284b68fdae 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -38,7 +38,6 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPainterPath>
 #include <QPixmapCache>
 #include <QPropertyAnimation>
 #include <QStyle>
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp
index 4c681a5024..2aa66b0f80 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp
@@ -30,7 +30,6 @@
 
 #include <QEasingCurve>
 #include <QPainter>
-#include <QPainterPath>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp
index 7b25bbb9af..e54f4bc26a 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/playhead.cpp
@@ -30,6 +30,7 @@
 #include <QApplication>
 #include <QGraphicsScene>
 #include <QPainter>
+#include <QPainterPath>
 
 #include <cmath>
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
index cc337f25fc..632039c865 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
@@ -28,6 +28,10 @@
 #include "playhead.h"
 
 #include <QApplication>
+#include <QMouseEvent>
+#include <QPainterPath>
+#include <QPoint>
+#include <QRectF>
 
 #include <cmath>
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selector.h b/src/plugins/qmldesigner/components/curveeditor/detail/selector.h
index 4027cc87b1..8077f8da3c 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/selector.h
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/selector.h
@@ -28,11 +28,6 @@
 #include "curveeditorstyle.h"
 #include "selectableitem.h"
 
-#include <QMouseEvent>
-#include <QPainterPath>
-#include <QPoint>
-#include <QRectF>
-
 namespace DesignTools {
 
 class GraphicsView;
@@ -68,19 +63,19 @@ private:
 
     void applyPreSelection(GraphicsView *view);
 
-    Shortcuts m_shortcuts = Shortcuts();
+    Shortcuts m_shortcuts;
 
     Shortcut m_shortcut;
 
     SelectionTool m_tool = SelectionTool::Rectangle;
 
-    QPoint m_mouseInit = QPoint();
+    QPoint m_mouseInit;
 
-    QPoint m_mouseCurr = QPoint();
+    QPoint m_mouseCurr;
 
-    QPainterPath m_lasso = QPainterPath();
+    QPainterPath m_lasso;
 
-    QRectF m_rect = QRectF();
+    QRectF m_rect;
 };
 
 } // End namespace DesignTools.
diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
index 69958aaeae..1cfeb02ba1 100644
--- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
@@ -26,7 +26,6 @@
 #include "anchorindicatorgraphicsitem.h"
 
 #include <QPainter>
-#include <QPainterPath>
 
 #include <QGraphicsScene>
 #include <QGraphicsView>
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 512f377b54..c07ee5233b 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -37,6 +37,7 @@
 
 #include <QDebug>
 #include <QPainter>
+#include <QPainterPath>
 #include <QStyleOptionGraphicsItem>
 #include <QTimeLine>
 #include <QGraphicsView>
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h
index 4393d0b97e..3e38ff3c00 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h
@@ -32,6 +32,7 @@
 
 QT_BEGIN_NAMESPACE
 class QTimeLine;
+class QPainterPath;
 QT_END_NAMESPACE
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
index 602666e895..47df2b3e9f 100644
--- a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
+++ b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
@@ -36,6 +36,7 @@
 #include <theme.h>
 
 #include <QPainter>
+#include <QPainterPath>
 #include <QMenu>
 #include <QtDebug>
 #include <QGraphicsSceneMouseEvent>
diff --git a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.h b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.h
index b9868a2db2..a9cd061d77 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.h
+++ b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.h
@@ -29,7 +29,7 @@
 #include <QMetaType>
 #include <QPointF>
 
-QT_FORWARD_DECLARE_CLASS(QPainterPath);
+QT_FORWARD_DECLARE_CLASS(QPainterPath)
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineitem.cpp
index 95c0137766..3b7f8a2fe0 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineitem.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineitem.cpp
@@ -40,6 +40,7 @@
 #include <QCursor>
 #include <QGraphicsView>
 #include <QPainter>
+#include <QPainterPath>
 
 #include <cmath>
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineitem.h b/src/plugins/qmldesigner/components/timelineeditor/timelineitem.h
index 917d48d9c6..9d8bd9493e 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineitem.h
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineitem.h
@@ -31,6 +31,8 @@
 #include <QGraphicsWidget>
 #include <QTimer>
 
+QT_FORWARD_DECLARE_CLASS(QPainterPath)
+
 namespace QmlDesigner {
 
 class TimelineItem : public QGraphicsWidget
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
index 7549e741bd..d8d34fe1d1 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
@@ -52,6 +52,7 @@
 #include <QHBoxLayout>
 #include <QMenu>
 #include <QPainter>
+#include <QPainterPath>
 
 #include <QGraphicsView>
 
diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp
index fb971da145..f7f6718f9b 100644
--- a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp
@@ -35,6 +35,7 @@
 
 #include <QDebug>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPen>
 #include <QStringList>
 #include <QUndoStack>
diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.h b/src/plugins/scxmleditor/plugin_interface/connectableitem.h
index 93217ddfa0..3d242bcd29 100644
--- a/src/plugins/scxmleditor/plugin_interface/connectableitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.h
@@ -31,6 +31,7 @@
 #include <QPen>
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsSceneMouseEvent)
+QT_FORWARD_DECLARE_CLASS(QPainterPath)
 
 namespace ScxmlEditor {
 
diff --git a/src/plugins/texteditor/texteditoroverlay.h b/src/plugins/texteditor/texteditoroverlay.h
index 42a0ef33da..374bc0ea1e 100644
--- a/src/plugins/texteditor/texteditoroverlay.h
+++ b/src/plugins/texteditor/texteditoroverlay.h
@@ -32,6 +32,7 @@
 #include <QColor>
 
 QT_FORWARD_DECLARE_CLASS(QWidget)
+QT_FORWARD_DECLARE_CLASS(QPainterPath)
 
 namespace TextEditor {
 class NameMangler;