fix QPainterPath against Qt 5.15.0

Change-Id: I08aaf6886b04407f1e52ca4f56607c81fccec85c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-18 18:51:42 +01:00
parent 3e86ed81d9
commit a72acde713
22 changed files with 27 additions and 15 deletions
--- 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 {

--- 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 {
--- 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 {
--- 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 {
--- 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;
--- 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>

--- 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>
--- 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>
--- 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>

--- 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>

--- 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.
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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 {

--- 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>

--- 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
--- 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>

--- 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>
--- 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 {

--- 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;