aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch')
-rw-r--r--recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch115
1 files changed, 0 insertions, 115 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch b/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
deleted file mode 100644
index aa21ef5e..00000000
--- a/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From db11c16b977e204c7000ef689452045f85ba98b7 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Thu, 12 Mar 2020 09:26:58 +0100
-Subject: [PATCH] Fix QPainterPath-related compilation errors in Qt 5.15
-
-Some include of QPainterPath was removed in Qt, causing errors like:
-
-easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath'
-easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath'
-easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int'
-to 'const QPainterPath &'
-easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath'
-easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath'
-...
-
-Add the missing include statements.
-
-Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-(cherry picked from commit b8ad0fdae90679b18238f58522058ea9b5934646)
----
- src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp | 2 ++
- src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp | 1 +
- src/libs/qmleditorwidgets/easingpane/easinggraph.cpp | 1 +
- src/plugins/coreplugin/fancyactionbar.cpp | 1 +
- src/plugins/coreplugin/manhattanstyle.cpp | 1 +
- src/plugins/texteditor/texteditor.cpp | 1 +
- src/plugins/texteditor/texteditoroverlay.cpp | 1 +
- 7 files changed, 8 insertions(+)
-
-diff --git a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-index 880835287a..930f8450ad 100644
---- a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-+++ b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-@@ -27,6 +27,8 @@
-
- #include "shapes.h"
-
-+#include <QPainterPath>
-+
- namespace qmt {
-
- ShapePaintVisitor::ShapePaintVisitor(QPainter *painter, const QPointF &scaledOrigin, const QSizeF &originalSize,
-diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-index d43b458881..ded1b544af 100644
---- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-@@ -30,6 +30,7 @@
-
- #include <QGraphicsPixmapItem>
- #include <QGraphicsScene>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- #include <QSequentialAnimationGroup>
-
-diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-index 4163569c04..e8360e0db6 100644
---- a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-@@ -26,6 +26,7 @@
- #include "easinggraph.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOptionGraphicsItem>
- #include <math.h>
-
-diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
-index 8d496ea3d2..72875823a2 100644
---- a/src/plugins/coreplugin/fancyactionbar.cpp
-+++ b/src/plugins/coreplugin/fancyactionbar.cpp
-@@ -38,6 +38,7 @@
- #include <QEvent>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QPropertyAnimation>
- #include <QStyle>
-diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
-index 709dcf62aa..156cac322e 100644
---- a/src/plugins/coreplugin/manhattanstyle.cpp
-+++ b/src/plugins/coreplugin/manhattanstyle.cpp
-@@ -43,6 +43,7 @@
- #include <QLineEdit>
- #include <QMenuBar>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QStatusBar>
- #include <QStyleFactory>
-diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
-index 59926e31ea..576dea22d8 100644
---- a/src/plugins/texteditor/texteditor.cpp
-+++ b/src/plugins/texteditor/texteditor.cpp
-@@ -98,6 +98,7 @@
- #include <QMessageBox>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPrintDialog>
- #include <QPrinter>
- #include <QPropertyAnimation>
-diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
-index a33ca13810..431045f1db 100644
---- a/src/plugins/texteditor/texteditoroverlay.cpp
-+++ b/src/plugins/texteditor/texteditoroverlay.cpp
-@@ -30,6 +30,7 @@
- #include <QDebug>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextBlock>
-
- #include <algorithm>