diff options
Diffstat (limited to 'recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch')
-rw-r--r-- | recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch b/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch new file mode 100644 index 00000000..71a5c7ba --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch @@ -0,0 +1,228 @@ +From 4f432cfcb19f41e6a4ec8d3c7f871f66e461fb63 Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff <mikko.gronoff@qt.io> +Date: Thu, 12 Mar 2020 13:14:29 +0200 +Subject: [PATCH] fix qpainterpath build issues + +--- + examples/dials/attitude_indicator.cpp | 1 + + examples/itemeditor/editor.cpp | 1 + + examples/sinusplot/sinusplot.cpp | 1 + + src/qwt_compass_rose.cpp | 1 + + src/qwt_dial_needle.cpp | 1 + + src/qwt_null_paintdevice.cpp | 1 + + src/qwt_painter.cpp | 1 + + src/qwt_painter_command.cpp | 1 + + src/qwt_painter_command.h | 1 + + src/qwt_picker.cpp | 1 + + src/qwt_plot_canvas.cpp | 1 + + src/qwt_plot_glcanvas.cpp | 1 + + src/qwt_plot_glcanvas.h | 1 + + src/qwt_plot_panner.cpp | 1 + + src/qwt_plot_renderer.cpp | 1 + + src/qwt_plot_shapeitem.cpp | 1 + + src/qwt_widget_overlay.cpp | 1 + + 17 files changed, 17 insertions(+) + +diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp +index ea0d5ab..a01611e 100644 +--- a/examples/dials/attitude_indicator.cpp ++++ b/examples/dials/attitude_indicator.cpp +@@ -3,6 +3,7 @@ + #include <qwt_round_scale_draw.h> + #include <qevent.h> + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qpolygon.h> + + AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color ) +diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp +index bd06372..7c4a6ef 100644 +--- a/examples/itemeditor/editor.cpp ++++ b/examples/itemeditor/editor.cpp +@@ -4,6 +4,7 @@ + #include <qwt_scale_map.h> + #include <qwt_plot_shapeitem.h> + #include <qevent.h> ++#include <qpainterpath.h> + + class Overlay: public QwtWidgetOverlay + { +diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp +index 119fa4a..6a9bfe7 100644 +--- a/examples/sinusplot/sinusplot.cpp ++++ b/examples/sinusplot/sinusplot.cpp +@@ -1,5 +1,6 @@ + #include <qapplication.h> + #include <qlayout.h> ++#include <qpainterpath.h> + #include <qwt_plot.h> + #include <qwt_plot_marker.h> + #include <qwt_plot_curve.h> +diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp +index 05f7039..fbd30fe 100644 +--- a/src/qwt_compass_rose.cpp ++++ b/src/qwt_compass_rose.cpp +@@ -11,6 +11,7 @@ + #include "qwt_point_polar.h" + #include "qwt_painter.h" + #include <qpainter.h> ++#include <qpainterpath.h> + + static QPointF qwtIntersection( + QPointF p11, QPointF p12, QPointF p21, QPointF p22 ) +diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp +index 49dd44a..d98f68c 100644 +--- a/src/qwt_dial_needle.cpp ++++ b/src/qwt_dial_needle.cpp +@@ -13,6 +13,7 @@ + #include "qwt_painter.h" + #include <qapplication.h> + #include <qpainter.h> ++#include <qpainterpath.h> + + #if QT_VERSION < 0x040601 + #define qFastSin(x) qSin(x) +diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp +index 3baf0e9..468a838 100644 +--- a/src/qwt_null_paintdevice.cpp ++++ b/src/qwt_null_paintdevice.cpp +@@ -9,6 +9,7 @@ + + #include "qwt_null_paintdevice.h" + #include <qpaintengine.h> ++#include <qpainterpath.h> + #include <qpixmap.h> + + class QwtNullPaintDevice::PrivateData +diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp +index 7959fe5..626677f 100644 +--- a/src/qwt_painter.cpp ++++ b/src/qwt_painter.cpp +@@ -17,6 +17,7 @@ + #include <qframe.h> + #include <qrect.h> + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qpalette.h> + #include <qpaintdevice.h> + #include <qpixmap.h> +diff --git a/src/qwt_painter_command.cpp b/src/qwt_painter_command.cpp +index 39faca9..fcd068d 100644 +--- a/src/qwt_painter_command.cpp ++++ b/src/qwt_painter_command.cpp +@@ -7,6 +7,7 @@ + * modify it under the terms of the Qwt License, Version 1.0 + *****************************************************************************/ + ++#include <qpainterpath.h> + #include "qwt_painter_command.h" + + //! Construct an invalid command +diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h +index a2f509a..fab52a8 100644 +--- a/src/qwt_painter_command.h ++++ b/src/qwt_painter_command.h +@@ -12,6 +12,7 @@ + + #include "qwt_global.h" + #include <qpaintengine.h> ++#include <qpainterpath.h> + #include <qpixmap.h> + #include <qimage.h> + #include <qpolygon.h> +diff --git a/src/qwt_picker.cpp b/src/qwt_picker.cpp +index dfd7e9b..3e20578 100644 +--- a/src/qwt_picker.cpp ++++ b/src/qwt_picker.cpp +@@ -15,6 +15,7 @@ + #include <qapplication.h> + #include <qevent.h> + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qframe.h> + #include <qcursor.h> + #include <qbitmap.h> +diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp +index 9438f15..bfe660d 100644 +--- a/src/qwt_plot_canvas.cpp ++++ b/src/qwt_plot_canvas.cpp +@@ -13,6 +13,7 @@ + #include "qwt_math.h" + #include "qwt_plot.h" + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qstyle.h> + #include <qstyleoption.h> + #include <qpaintengine.h> +diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp +index 996c0ad..6975863 100644 +--- a/src/qwt_plot_glcanvas.cpp ++++ b/src/qwt_plot_glcanvas.cpp +@@ -12,6 +12,7 @@ + #include "qwt_painter.h" + #include <qevent.h> + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qdrawutil.h> + #include <qstyle.h> + #include <qstyleoption.h> +diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h +index 7ca9b5a..a2dfeda 100644 +--- a/src/qwt_plot_glcanvas.h ++++ b/src/qwt_plot_glcanvas.h +@@ -12,6 +12,7 @@ + + #include "qwt_global.h" + #include <qframe.h> ++#include <qpainterpath.h> + #include <qgl.h> + + class QwtPlot; +diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp +index b7daa05..59bd2df 100644 +--- a/src/qwt_plot_panner.cpp ++++ b/src/qwt_plot_panner.cpp +@@ -12,6 +12,7 @@ + #include "qwt_plot.h" + #include "qwt_painter.h" + #include <qbitmap.h> ++#include <qpainterpath.h> + #include <qstyle.h> + #include <qstyleoption.h> + +diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp +index 549c4bc..71cadec 100644 +--- a/src/qwt_plot_renderer.cpp ++++ b/src/qwt_plot_renderer.cpp +@@ -20,6 +20,7 @@ + #include "qwt_math.h" + + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qtransform.h> + #include <qprinter.h> + #include <qfiledialog.h> +diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp +index db7896b..56bc208 100644 +--- a/src/qwt_plot_shapeitem.cpp ++++ b/src/qwt_plot_shapeitem.cpp +@@ -7,6 +7,7 @@ + * modify it under the terms of the Qwt License, Version 1.0 + *****************************************************************************/ + ++#include <qpainterpath.h> + #include "qwt_plot_shapeitem.h" + #include "qwt_scale_map.h" + #include "qwt_painter.h" +diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp +index 5974413..fa6da48 100644 +--- a/src/qwt_widget_overlay.cpp ++++ b/src/qwt_widget_overlay.cpp +@@ -10,6 +10,7 @@ + #include "qwt_widget_overlay.h" + #include "qwt_painter.h" + #include <qpainter.h> ++#include <qpainterpath.h> + #include <qpaintengine.h> + #include <qimage.h> + #include <qevent.h> |