forked from qt-creator/qt-creator
fix QPainterPath against Qt 5.15.0
Change-Id: I08aaf6886b04407f1e52ca4f56607c81fccec85c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -54,6 +54,7 @@
|
|||||||
#include <QFont>
|
#include <QFont>
|
||||||
#include <QPen>
|
#include <QPen>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
|
|
||||||
namespace qmt {
|
namespace qmt {
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
class QGraphicsSimpleTextItem;
|
class QGraphicsSimpleTextItem;
|
||||||
|
class QPainterPath;
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace qmt {
|
namespace qmt {
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
class QGraphicsPathItem;
|
class QGraphicsPathItem;
|
||||||
|
class QPainterPath;
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace qmt {
|
namespace qmt {
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
#include <QBrush>
|
#include <QBrush>
|
||||||
#include <QLineF>
|
#include <QLineF>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
|
||||||
namespace qmt {
|
namespace qmt {
|
||||||
|
|||||||
@@ -27,6 +27,8 @@
|
|||||||
|
|
||||||
#include <QGraphicsItem>
|
#include <QGraphicsItem>
|
||||||
|
|
||||||
|
QT_FORWARD_DECLARE_CLASS(QPainterPath)
|
||||||
|
|
||||||
namespace qmt {
|
namespace qmt {
|
||||||
|
|
||||||
class IWindable;
|
class IWindable;
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
|
|
||||||
#include <QGraphicsPixmapItem>
|
#include <QGraphicsPixmapItem>
|
||||||
#include <QGraphicsScene>
|
#include <QGraphicsScene>
|
||||||
#include <QPainterPath>
|
|
||||||
#include <QPropertyAnimation>
|
#include <QPropertyAnimation>
|
||||||
#include <QSequentialAnimationGroup>
|
#include <QSequentialAnimationGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,6 @@
|
|||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPainterPath>
|
|
||||||
#include <QPixmapCache>
|
#include <QPixmapCache>
|
||||||
#include <QPropertyAnimation>
|
#include <QPropertyAnimation>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
|
|
||||||
#include <QEasingCurve>
|
#include <QEasingCurve>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPainterPath>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QGraphicsScene>
|
#include <QGraphicsScene>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,10 @@
|
|||||||
#include "playhead.h"
|
#include "playhead.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
#include <QMouseEvent>
|
||||||
|
#include <QPainterPath>
|
||||||
|
#include <QPoint>
|
||||||
|
#include <QRectF>
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|||||||
@@ -28,11 +28,6 @@
|
|||||||
#include "curveeditorstyle.h"
|
#include "curveeditorstyle.h"
|
||||||
#include "selectableitem.h"
|
#include "selectableitem.h"
|
||||||
|
|
||||||
#include <QMouseEvent>
|
|
||||||
#include <QPainterPath>
|
|
||||||
#include <QPoint>
|
|
||||||
#include <QRectF>
|
|
||||||
|
|
||||||
namespace DesignTools {
|
namespace DesignTools {
|
||||||
|
|
||||||
class GraphicsView;
|
class GraphicsView;
|
||||||
@@ -68,19 +63,19 @@ private:
|
|||||||
|
|
||||||
void applyPreSelection(GraphicsView *view);
|
void applyPreSelection(GraphicsView *view);
|
||||||
|
|
||||||
Shortcuts m_shortcuts = Shortcuts();
|
Shortcuts m_shortcuts;
|
||||||
|
|
||||||
Shortcut m_shortcut;
|
Shortcut m_shortcut;
|
||||||
|
|
||||||
SelectionTool m_tool = SelectionTool::Rectangle;
|
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.
|
} // End namespace DesignTools.
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
#include "anchorindicatorgraphicsitem.h"
|
#include "anchorindicatorgraphicsitem.h"
|
||||||
|
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPainterPath>
|
|
||||||
|
|
||||||
#include <QGraphicsScene>
|
#include <QGraphicsScene>
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
#include <QStyleOptionGraphicsItem>
|
#include <QStyleOptionGraphicsItem>
|
||||||
#include <QTimeLine>
|
#include <QTimeLine>
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
class QTimeLine;
|
class QTimeLine;
|
||||||
|
class QPainterPath;
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace QmlDesigner {
|
namespace QmlDesigner {
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
#include <theme.h>
|
#include <theme.h>
|
||||||
|
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
#include <QGraphicsSceneMouseEvent>
|
#include <QGraphicsSceneMouseEvent>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
#include <QMetaType>
|
#include <QMetaType>
|
||||||
#include <QPointF>
|
#include <QPointF>
|
||||||
|
|
||||||
QT_FORWARD_DECLARE_CLASS(QPainterPath);
|
QT_FORWARD_DECLARE_CLASS(QPainterPath)
|
||||||
|
|
||||||
namespace QmlDesigner {
|
namespace QmlDesigner {
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
#include <QCursor>
|
#include <QCursor>
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,8 @@
|
|||||||
#include <QGraphicsWidget>
|
#include <QGraphicsWidget>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
|
QT_FORWARD_DECLARE_CLASS(QPainterPath)
|
||||||
|
|
||||||
namespace QmlDesigner {
|
namespace QmlDesigner {
|
||||||
|
|
||||||
class TimelineItem : public QGraphicsWidget
|
class TimelineItem : public QGraphicsWidget
|
||||||
|
|||||||
@@ -52,6 +52,7 @@
|
|||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
|
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
#include <QPainterPath>
|
||||||
#include <QPen>
|
#include <QPen>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QUndoStack>
|
#include <QUndoStack>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
#include <QPen>
|
#include <QPen>
|
||||||
|
|
||||||
QT_FORWARD_DECLARE_CLASS(QGraphicsSceneMouseEvent)
|
QT_FORWARD_DECLARE_CLASS(QGraphicsSceneMouseEvent)
|
||||||
|
QT_FORWARD_DECLARE_CLASS(QPainterPath)
|
||||||
|
|
||||||
namespace ScxmlEditor {
|
namespace ScxmlEditor {
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
#include <QColor>
|
#include <QColor>
|
||||||
|
|
||||||
QT_FORWARD_DECLARE_CLASS(QWidget)
|
QT_FORWARD_DECLARE_CLASS(QWidget)
|
||||||
|
QT_FORWARD_DECLARE_CLASS(QPainterPath)
|
||||||
|
|
||||||
namespace TextEditor {
|
namespace TextEditor {
|
||||||
class NameMangler;
|
class NameMangler;
|
||||||
|
|||||||
Reference in New Issue
Block a user