diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
| commit | c8a2ea54333b4d0582afb62b4120558f8c6945e7 (patch) | |
| tree | 156b198998adf6b034944ec58bc74cca41830b6d /src/plugins/scxmleditor | |
| parent | 070aca8fea5fec0c31542c1b70e60bd9c493300a (diff) | |
| parent | ff6dd4dc2e95ce39fd423ca520c72fe50dc64aa1 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp
Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
Diffstat (limited to 'src/plugins/scxmleditor')
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/connectableitem.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/connectableitem.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp index fb971da1459..f7f6718f9b0 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 93217ddfa07..3d242bcd29f 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 { |