qwt: fix build w/ qt5-5.15.0

This commit is contained in:
Jürgen Buchmüller 2020-07-14 16:54:50 +02:00
parent b16545a9f6
commit 765defd05c

View file

@ -0,0 +1,58 @@
Source: @pullmoll
Upstream: no
Reason: qt5-5.15.0 requires explicit include for QPainterPath
--- src/qwt_painter.h 2019-01-02 17:21:30.232435482 +0100
+++ src/qwt_painter.h 2020-07-14 16:47:54.577577031 +0200
@@ -17,6 +17,7 @@
#include <qpen.h>
#include <qline.h>
#include <qpalette.h>
+#include <qpainterpath.h>
class QPainter;
class QBrush;
@@ -31,7 +32,6 @@
class QwtInterval;
class QTextDocument;
-class QPainterPath;
/*!
\brief A collection of QPainter workarounds
--- src/qwt_null_paintdevice.cpp 2019-01-02 17:21:31.296461212 +0100
+++ src/qwt_null_paintdevice.cpp 2020-07-14 16:49:13.479579545 +0200
@@ -9,6 +9,7 @@
#include "qwt_null_paintdevice.h"
#include <qpaintengine.h>
+#include <qpainterpath.h>
#include <qpixmap.h>
class QwtNullPaintDevice::PrivateData
--- src/qwt_painter_command.h 2019-01-02 17:21:30.320437610 +0100
+++ src/qwt_painter_command.h 2020-07-14 16:50:38.501582253 +0200
@@ -12,12 +12,11 @@
#include "qwt_global.h"
#include <qpaintengine.h>
+#include <qpainterpath.h>
#include <qpixmap.h>
#include <qimage.h>
#include <qpolygon.h>
-class QPainterPath;
-
/*!
QwtPainterCommand represents the attributes of a paint operation
how it is used between QPainter and QPaintDevice
--- src/qwt_plot_glcanvas.h 2019-01-02 17:21:30.204434804 +0100
+++ src/qwt_plot_glcanvas.h 2020-07-14 16:52:54.074586572 +0200
@@ -13,6 +13,7 @@
#include "qwt_global.h"
#include <qframe.h>
#include <qgl.h>
+#include <qpainterpath.h>
class QwtPlot;