0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115
  1. From e1f9005cf5ebafbed6be4b0cae4bee59112ea780 Mon Sep 17 00:00:00 2001
  2. From: Ale Martinez <amtriathlon@gmail.com>
  3. Date: Thu, 11 Jun 2020 11:36:54 -0300
  4. Subject: Fix Qwt incompatibilities with Qt 5.15.0
  5. diff --git a/qwt/src/qwt_compass_rose.cpp b/qwt/src/qwt_compass_rose.cpp
  6. index 21a35f244..d67175940 100644
  7. --- a/qwt/src/qwt_compass_rose.cpp
  8. +++ b/qwt/src/qwt_compass_rose.cpp
  9. @@ -11,6 +11,7 @@
  10. #include "qwt_point_polar.h"
  11. #include "qwt_painter.h"
  12. #include <qpainter.h>
  13. +#include <qpainterpath.h>
  14. static QPointF qwtIntersection(
  15. QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
  16. diff --git a/qwt/src/qwt_dial_needle.cpp b/qwt/src/qwt_dial_needle.cpp
  17. index 1b53a3d5b..694f7f2bb 100644
  18. --- a/qwt/src/qwt_dial_needle.cpp
  19. +++ b/qwt/src/qwt_dial_needle.cpp
  20. @@ -13,6 +13,7 @@
  21. #include "qwt_painter.h"
  22. #include <qapplication.h>
  23. #include <qpainter.h>
  24. +#include <qpainterpath.h>
  25. #if QT_VERSION < 0x040601
  26. #define qFastSin(x) qSin(x)
  27. diff --git a/qwt/src/qwt_null_paintdevice.cpp b/qwt/src/qwt_null_paintdevice.cpp
  28. index db1611da2..b9b5dafb6 100644
  29. --- a/qwt/src/qwt_null_paintdevice.cpp
  30. +++ b/qwt/src/qwt_null_paintdevice.cpp
  31. @@ -9,6 +9,7 @@
  32. #include "qwt_null_paintdevice.h"
  33. #include <qpaintengine.h>
  34. +#include <qpainterpath.h>
  35. #include <qpixmap.h>
  36. class QwtNullPaintDevice::PrivateData
  37. diff --git a/qwt/src/qwt_painter.cpp b/qwt/src/qwt_painter.cpp
  38. index 0bbf258c5..07b217033 100644
  39. --- a/qwt/src/qwt_painter.cpp
  40. +++ b/qwt/src/qwt_painter.cpp
  41. @@ -19,6 +19,7 @@
  42. #include <qpainter.h>
  43. #include <qpalette.h>
  44. #include <qpaintdevice.h>
  45. +#include <qpainterpath.h>
  46. #include <qpixmap.h>
  47. #include <qstyle.h>
  48. #include <qtextdocument.h>
  49. diff --git a/qwt/src/qwt_painter_command.h b/qwt/src/qwt_painter_command.h
  50. index 2da597a7f..4fafd555c 100644
  51. --- a/qwt/src/qwt_painter_command.h
  52. +++ b/qwt/src/qwt_painter_command.h
  53. @@ -15,6 +15,7 @@
  54. #include <qpixmap.h>
  55. #include <qimage.h>
  56. #include <qpolygon.h>
  57. +#include <qpainterpath.h>
  58. class QPainterPath;
  59. diff --git a/qwt/src/qwt_plot_glcanvas.h b/qwt/src/qwt_plot_glcanvas.h
  60. index 2ff1cf2e3..89462bba9 100644
  61. --- a/qwt/src/qwt_plot_glcanvas.h
  62. +++ b/qwt/src/qwt_plot_glcanvas.h
  63. @@ -13,6 +13,7 @@
  64. #include "qwt_global.h"
  65. #include <qframe.h>
  66. #include <qgl.h>
  67. +#include <qpainterpath.h>
  68. class QwtPlot;
  69. diff --git a/qwt/src/qwt_plot_panner.cpp b/qwt/src/qwt_plot_panner.cpp
  70. index 8ed3dbee9..44de4cbef 100644
  71. --- a/qwt/src/qwt_plot_panner.cpp
  72. +++ b/qwt/src/qwt_plot_panner.cpp
  73. @@ -15,6 +15,7 @@
  74. #include <qbitmap.h>
  75. #include <qstyle.h>
  76. #include <qstyleoption.h>
  77. +#include <qpainterpath.h>
  78. static QBitmap qwtBorderMask( const QWidget *canvas, const QSize &size )
  79. {
  80. diff --git a/qwt/src/qwt_plot_renderer.cpp b/qwt/src/qwt_plot_renderer.cpp
  81. index 3cdcd8c0e..09a5c0a10 100644
  82. --- a/qwt/src/qwt_plot_renderer.cpp
  83. +++ b/qwt/src/qwt_plot_renderer.cpp
  84. @@ -19,6 +19,7 @@
  85. #include "qwt_math.h"
  86. #include <qpainter.h>
  87. #include <qpaintengine.h>
  88. +#include <qpainterpath.h>
  89. #include <qtransform.h>
  90. #include <qprinter.h>
  91. #include <qprintdialog.h>
  92. diff --git a/qwt/src/qwt_widget_overlay.cpp b/qwt/src/qwt_widget_overlay.cpp
  93. index 07c6272e1..9a458277b 100644
  94. --- a/qwt/src/qwt_widget_overlay.cpp
  95. +++ b/qwt/src/qwt_widget_overlay.cpp
  96. @@ -11,6 +11,7 @@
  97. #include "qwt_painter.h"
  98. #include <qpainter.h>
  99. #include <qpaintengine.h>
  100. +#include <qpainterpath.h>
  101. #include <qimage.h>
  102. #include <qevent.h>