qwt: compatibility fix for Qt 5.15

3 files changed, 163 insertions, 26 deletions

diff --git a/src/qwt-1-fixes-crlf.patch b/src/qwt-1-fixes-crlf.patch
deleted file mode 100644
index 6ae37ca..0000000
--- a/src/qwt-1-fixes-crlf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Tue, 9 Dec 2014 20:10:47 +1100
-Subject: [PATCH] fix install prefix
-
-
-diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 1fe6055..3a69039 100644
---- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -24,7 +24,7 @@ unix {
- }

- 

- win32 {

--    QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION

-+    # QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION

-     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION

- }

- 

--- 
-2.7.4
-
diff --git a/src/qwt-1-fixes.patch b/src/qwt-1-fixes.patch
new file mode 100644
index 0000000..9593fb8
--- /dev/null
+++ b/src/qwt-1-fixes.patch
@@ -0,0 +1,162 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Tue, 9 Dec 2014 20:10:47 +1100
+Subject: [PATCH 1/2] fix install prefix
+
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 1111111..2222222 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -24,7 +24,7 @@ unix {
+ }

+ 

+ win32 {

+-    QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION

++    # QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION

+     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION

+ }

+ 

+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Fri, 29 May 2020 00:25:54 +0200
+Subject: [PATCH 2/2] add missing include for QPainterPath
+
+
+diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
+index 1111111..2222222 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 1111111..2222222 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 1111111..2222222 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 1111111..2222222 100644
+--- a/src/qwt_painter.cpp
++++ b/src/qwt_painter.cpp
+@@ -19,6 +19,7 @@
+ #include <qpainter.h>

+ #include <qpalette.h>

+ #include <qpaintdevice.h>

++#include <qpainterpath.h>

+ #include <qpixmap.h>

+ #include <qstyle.h>

+ #include <qtextdocument.h>

+diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
+index 1111111..2222222 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_plot_canvas.cpp b/src/qwt_plot_canvas.cpp
+index 1111111..2222222 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 1111111..2222222 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 1111111..2222222 100644
+--- a/src/qwt_plot_glcanvas.h
++++ b/src/qwt_plot_glcanvas.h
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"

+ #include <qframe.h>

+ #include <qgl.h>

++#include <qpainterpath.h>

+ 

+ class QwtPlot;

+ 

+diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
+index 1111111..2222222 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 1111111..2222222 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_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
+index 1111111..2222222 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>

diff --git a/src/qwt.mk b/src/qwt.mk
index 2a971ff..e611707 100644
--- a/src/qwt.mk
+++ b/src/qwt.mk
@@ -23,6 +23,7 @@ define $(PKG)_BUILD
 
     # doesn't support out-of-source build
     cd '$(SOURCE_DIR)' && $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake \
+        'QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations' \
         -after \
         'SUBDIRS -= doc designer' \
         'CONFIG -= debug_and_release'