diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 09:34:19 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-17 10:12:45 +0200 |
| commit | 6fb095e3bda4104776b2fbabf9179f6c6eca05d7 (patch) | |
| tree | a03b3eee5a1abed3232c3ecfac9ffa9a25acf507 /recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch | |
| parent | 65028944ee13f5fa7939aa0b669ecc8ad358012d (diff) | |
| download | meta-qt5-6fb095e3bda4104776b2fbabf9179f6c6eca05d7.tar.gz | |
qt5: update submodulesv5.15.0-beta2
Update to latest content in Qt 5.15 branch.
Task-number: QTBUG-80823
Change-Id: I30451a35af341a3ffc7636bb5018611ef6bc0016
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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 @@ | |||
| 1 | From 4f432cfcb19f41e6a4ec8d3c7f871f66e461fb63 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mikko Gronoff <mikko.gronoff@qt.io> | ||
| 3 | Date: Thu, 12 Mar 2020 13:14:29 +0200 | ||
| 4 | Subject: [PATCH] fix qpainterpath build issues | ||
| 5 | |||
| 6 | --- | ||
| 7 | examples/dials/attitude_indicator.cpp | 1 + | ||
| 8 | examples/itemeditor/editor.cpp | 1 + | ||
| 9 | examples/sinusplot/sinusplot.cpp | 1 + | ||
| 10 | src/qwt_compass_rose.cpp | 1 + | ||
| 11 | src/qwt_dial_needle.cpp | 1 + | ||
| 12 | src/qwt_null_paintdevice.cpp | 1 + | ||
| 13 | src/qwt_painter.cpp | 1 + | ||
| 14 | src/qwt_painter_command.cpp | 1 + | ||
| 15 | src/qwt_painter_command.h | 1 + | ||
| 16 | src/qwt_picker.cpp | 1 + | ||
| 17 | src/qwt_plot_canvas.cpp | 1 + | ||
| 18 | src/qwt_plot_glcanvas.cpp | 1 + | ||
| 19 | src/qwt_plot_glcanvas.h | 1 + | ||
| 20 | src/qwt_plot_panner.cpp | 1 + | ||
| 21 | src/qwt_plot_renderer.cpp | 1 + | ||
| 22 | src/qwt_plot_shapeitem.cpp | 1 + | ||
| 23 | src/qwt_widget_overlay.cpp | 1 + | ||
| 24 | 17 files changed, 17 insertions(+) | ||
| 25 | |||
| 26 | diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp | ||
| 27 | index ea0d5ab..a01611e 100644 | ||
| 28 | --- a/examples/dials/attitude_indicator.cpp | ||
| 29 | +++ b/examples/dials/attitude_indicator.cpp | ||
| 30 | @@ -3,6 +3,7 @@ | ||
| 31 | #include <qwt_round_scale_draw.h> | ||
| 32 | #include <qevent.h> | ||
| 33 | #include <qpainter.h> | ||
| 34 | +#include <qpainterpath.h> | ||
| 35 | #include <qpolygon.h> | ||
| 36 | |||
| 37 | AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color ) | ||
| 38 | diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp | ||
| 39 | index bd06372..7c4a6ef 100644 | ||
| 40 | --- a/examples/itemeditor/editor.cpp | ||
| 41 | +++ b/examples/itemeditor/editor.cpp | ||
| 42 | @@ -4,6 +4,7 @@ | ||
| 43 | #include <qwt_scale_map.h> | ||
| 44 | #include <qwt_plot_shapeitem.h> | ||
| 45 | #include <qevent.h> | ||
| 46 | +#include <qpainterpath.h> | ||
| 47 | |||
| 48 | class Overlay: public QwtWidgetOverlay | ||
| 49 | { | ||
| 50 | diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp | ||
| 51 | index 119fa4a..6a9bfe7 100644 | ||
| 52 | --- a/examples/sinusplot/sinusplot.cpp | ||
| 53 | +++ b/examples/sinusplot/sinusplot.cpp | ||
| 54 | @@ -1,5 +1,6 @@ | ||
| 55 | #include <qapplication.h> | ||
| 56 | #include <qlayout.h> | ||
| 57 | +#include <qpainterpath.h> | ||
| 58 | #include <qwt_plot.h> | ||
| 59 | #include <qwt_plot_marker.h> | ||
| 60 | #include <qwt_plot_curve.h> | ||
| 61 | diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp | ||
| 62 | index 05f7039..fbd30fe 100644 | ||
| 63 | --- a/src/qwt_compass_rose.cpp | ||
| 64 | +++ b/src/qwt_compass_rose.cpp | ||
| 65 | @@ -11,6 +11,7 @@ | ||
| 66 | #include "qwt_point_polar.h" | ||
| 67 | #include "qwt_painter.h" | ||
| 68 | #include <qpainter.h> | ||
| 69 | +#include <qpainterpath.h> | ||
| 70 | |||
| 71 | static QPointF qwtIntersection( | ||
| 72 | QPointF p11, QPointF p12, QPointF p21, QPointF p22 ) | ||
| 73 | diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp | ||
| 74 | index 49dd44a..d98f68c 100644 | ||
| 75 | --- a/src/qwt_dial_needle.cpp | ||
| 76 | +++ b/src/qwt_dial_needle.cpp | ||
| 77 | @@ -13,6 +13,7 @@ | ||
| 78 | #include "qwt_painter.h" | ||
| 79 | #include <qapplication.h> | ||
| 80 | #include <qpainter.h> | ||
| 81 | +#include <qpainterpath.h> | ||
| 82 | |||
| 83 | #if QT_VERSION < 0x040601 | ||
| 84 | #define qFastSin(x) qSin(x) | ||
| 85 | diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp | ||
| 86 | index 3baf0e9..468a838 100644 | ||
| 87 | --- a/src/qwt_null_paintdevice.cpp | ||
| 88 | +++ b/src/qwt_null_paintdevice.cpp | ||
| 89 | @@ -9,6 +9,7 @@ | ||
| 90 | |||
| 91 | #include "qwt_null_paintdevice.h" | ||
| 92 | #include <qpaintengine.h> | ||
| 93 | +#include <qpainterpath.h> | ||
| 94 | #include <qpixmap.h> | ||
| 95 | |||
| 96 | class QwtNullPaintDevice::PrivateData | ||
| 97 | diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp | ||
| 98 | index 7959fe5..626677f 100644 | ||
| 99 | --- a/src/qwt_painter.cpp | ||
| 100 | +++ b/src/qwt_painter.cpp | ||
| 101 | @@ -17,6 +17,7 @@ | ||
| 102 | #include <qframe.h> | ||
| 103 | #include <qrect.h> | ||
| 104 | #include <qpainter.h> | ||
| 105 | +#include <qpainterpath.h> | ||
| 106 | #include <qpalette.h> | ||
| 107 | #include <qpaintdevice.h> | ||
| 108 | #include <qpixmap.h> | ||
| 109 | diff --git a/src/qwt_painter_command.cpp b/src/qwt_painter_command.cpp | ||
| 110 | index 39faca9..fcd068d 100644 | ||
| 111 | --- a/src/qwt_painter_command.cpp | ||
| 112 | +++ b/src/qwt_painter_command.cpp | ||
| 113 | @@ -7,6 +7,7 @@ | ||
| 114 | * modify it under the terms of the Qwt License, Version 1.0 | ||
| 115 | *****************************************************************************/ | ||
| 116 | |||
| 117 | +#include <qpainterpath.h> | ||
| 118 | #include "qwt_painter_command.h" | ||
| 119 | |||
| 120 | //! Construct an invalid command | ||
| 121 | diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h | ||
| 122 | index a2f509a..fab52a8 100644 | ||
| 123 | --- a/src/qwt_painter_command.h | ||
| 124 | +++ b/src/qwt_painter_command.h | ||
| 125 | @@ -12,6 +12,7 @@ | ||
| 126 | |||
| 127 | #include "qwt_global.h" | ||
| 128 | #include <qpaintengine.h> | ||
| 129 | +#include <qpainterpath.h> | ||
| 130 | #include <qpixmap.h> | ||
| 131 | #include <qimage.h> | ||
| 132 | #include <qpolygon.h> | ||
| 133 | diff --git a/src/qwt_picker.cpp b/src/qwt_picker.cpp | ||
| 134 | index dfd7e9b..3e20578 100644 | ||
| 135 | --- a/src/qwt_picker.cpp | ||
| 136 | +++ b/src/qwt_picker.cpp | ||
| 137 | @@ -15,6 +15,7 @@ | ||
| 138 | #include <qapplication.h> | ||
| 139 | #include <qevent.h> | ||
| 140 | #include <qpainter.h> | ||
| 141 | +#include <qpainterpath.h> | ||
| 142 | #include <qframe.h> | ||
| 143 | #include <qcursor.h> | ||
| 144 | #include <qbitmap.h> | ||
| 145 | diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp | ||
| 146 | index 9438f15..bfe660d 100644 | ||
| 147 | --- a/src/qwt_plot_canvas.cpp | ||
| 148 | +++ b/src/qwt_plot_canvas.cpp | ||
| 149 | @@ -13,6 +13,7 @@ | ||
| 150 | #include "qwt_math.h" | ||
| 151 | #include "qwt_plot.h" | ||
| 152 | #include <qpainter.h> | ||
| 153 | +#include <qpainterpath.h> | ||
| 154 | #include <qstyle.h> | ||
| 155 | #include <qstyleoption.h> | ||
| 156 | #include <qpaintengine.h> | ||
| 157 | diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp | ||
| 158 | index 996c0ad..6975863 100644 | ||
| 159 | --- a/src/qwt_plot_glcanvas.cpp | ||
| 160 | +++ b/src/qwt_plot_glcanvas.cpp | ||
| 161 | @@ -12,6 +12,7 @@ | ||
| 162 | #include "qwt_painter.h" | ||
| 163 | #include <qevent.h> | ||
| 164 | #include <qpainter.h> | ||
| 165 | +#include <qpainterpath.h> | ||
| 166 | #include <qdrawutil.h> | ||
| 167 | #include <qstyle.h> | ||
| 168 | #include <qstyleoption.h> | ||
| 169 | diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h | ||
| 170 | index 7ca9b5a..a2dfeda 100644 | ||
| 171 | --- a/src/qwt_plot_glcanvas.h | ||
| 172 | +++ b/src/qwt_plot_glcanvas.h | ||
| 173 | @@ -12,6 +12,7 @@ | ||
| 174 | |||
| 175 | #include "qwt_global.h" | ||
| 176 | #include <qframe.h> | ||
| 177 | +#include <qpainterpath.h> | ||
| 178 | #include <qgl.h> | ||
| 179 | |||
| 180 | class QwtPlot; | ||
| 181 | diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp | ||
| 182 | index b7daa05..59bd2df 100644 | ||
| 183 | --- a/src/qwt_plot_panner.cpp | ||
| 184 | +++ b/src/qwt_plot_panner.cpp | ||
| 185 | @@ -12,6 +12,7 @@ | ||
| 186 | #include "qwt_plot.h" | ||
| 187 | #include "qwt_painter.h" | ||
| 188 | #include <qbitmap.h> | ||
| 189 | +#include <qpainterpath.h> | ||
| 190 | #include <qstyle.h> | ||
| 191 | #include <qstyleoption.h> | ||
| 192 | |||
| 193 | diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp | ||
| 194 | index 549c4bc..71cadec 100644 | ||
| 195 | --- a/src/qwt_plot_renderer.cpp | ||
| 196 | +++ b/src/qwt_plot_renderer.cpp | ||
| 197 | @@ -20,6 +20,7 @@ | ||
| 198 | #include "qwt_math.h" | ||
| 199 | |||
| 200 | #include <qpainter.h> | ||
| 201 | +#include <qpainterpath.h> | ||
| 202 | #include <qtransform.h> | ||
| 203 | #include <qprinter.h> | ||
| 204 | #include <qfiledialog.h> | ||
| 205 | diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp | ||
| 206 | index db7896b..56bc208 100644 | ||
| 207 | --- a/src/qwt_plot_shapeitem.cpp | ||
| 208 | +++ b/src/qwt_plot_shapeitem.cpp | ||
| 209 | @@ -7,6 +7,7 @@ | ||
| 210 | * modify it under the terms of the Qwt License, Version 1.0 | ||
| 211 | *****************************************************************************/ | ||
| 212 | |||
| 213 | +#include <qpainterpath.h> | ||
| 214 | #include "qwt_plot_shapeitem.h" | ||
| 215 | #include "qwt_scale_map.h" | ||
| 216 | #include "qwt_painter.h" | ||
| 217 | diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp | ||
| 218 | index 5974413..fa6da48 100644 | ||
| 219 | --- a/src/qwt_widget_overlay.cpp | ||
| 220 | +++ b/src/qwt_widget_overlay.cpp | ||
| 221 | @@ -10,6 +10,7 @@ | ||
| 222 | #include "qwt_widget_overlay.h" | ||
| 223 | #include "qwt_painter.h" | ||
| 224 | #include <qpainter.h> | ||
| 225 | +#include <qpainterpath.h> | ||
| 226 | #include <qpaintengine.h> | ||
| 227 | #include <qimage.h> | ||
| 228 | #include <qevent.h> | ||
