diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-07-09 00:34:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:34:35 -0700 |
| commit | 3bffe1c0493c1220d3db2803a53c79add20d63d2 (patch) | |
| tree | 9f4b7fe02f0bc01f529ba2a626318373f1839cc9 /ports/qwt/build.patch | |
| parent | 6d4606fb795667ef58da5367dee867d6a350fff5 (diff) | |
| download | vcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.tar.gz vcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.zip | |
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
* [qt5] update and remove patches
* [baseline] skip qt5-canvas3d due to deprecation
* [qwt] update to 6.1.4 and fix build issues
* [qt5-webengine] remove old patches
* [qwt] fix static patch
* [qt5-location] add a message that the port has a sprious failure
* [qt5-webengine] fix filename of patch
* [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors)
* [qt5-winextras] depend on qt5-base[core]
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [qt5-base] update latest feature (latest=core)
* [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now
* [qt5-base] make qt5-base fail to get logs.
* [angle] include missing egl sources.
* [qt5-base] patch egl detection logic.
* [baseline] remove qt-x11extras:x64-linux=fail
* [qt5-base] need to be explicit about xcb to build qt5-x11extras
* [CI] add necessary system libraries to linux CI
* [qt5-base] remove comment to retry on linux
* [qt5-base] add static_init patch for MSVC
* [qt5-base] refined workaround to not regress linux and osx due to
* [paraview] remove unnecessary patches with newer qt versions
* [vcpkg/baseline] add webengine back to skip
* [vtk] fix missing include regression using patch from upstream
* [vtk] fix patch
* [qt5-base] replace with patch from upstream
* [paraview] use hdf5 1.10 api.
* [paraview] bump control
* Add more packages to Linux machines.
* [qt5-base] forgot to add the patch
* Delete 6943.diff
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/qwt/build.patch')
| -rw-r--r-- | ports/qwt/build.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/ports/qwt/build.patch b/ports/qwt/build.patch new file mode 100644 index 000000000..8b36bb833 --- /dev/null +++ b/ports/qwt/build.patch @@ -0,0 +1,135 @@ +diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp +index 8acb045c2..b7b676712 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>
+
+ 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 3589b011d..4f20aada1 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>
+
+ #if QT_VERSION < 0x040601
+ #define qFastSin(x) qSin(x)
+diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp +index 21b97b0ad..545804b06 100644 +--- a/src/qwt_null_paintdevice.cpp ++++ b/src/qwt_null_paintdevice.cpp +@@ -10,6 +10,7 @@ + #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
+ #include <qpixmap.h>
++#include <QPainterPath>
+
+ class QwtNullPaintDevice::PrivateData
+ {
+diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp +index 069e2ae42..824ddfc20 100644 +--- a/src/qwt_painter.cpp ++++ b/src/qwt_painter.cpp +@@ -27,6 +27,7 @@ + #include <qpaintengine.h>
+ #include <qapplication.h>
+ #include <qdesktopwidget.h>
++#include <QPainterPath>
+
+ #if QT_VERSION >= 0x050000
+ #include <qwindow.h>
+diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h +index 032d0348b..13db43559 100644 +--- a/src/qwt_painter_command.h ++++ b/src/qwt_painter_command.h +@@ -15,8 +15,7 @@ + #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+-
+-class QPainterPath;
++#include <QPainterPath>
+
+ /*!
+ QwtPainterCommand represents the attributes of a paint operation
+diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp +index 64b39b90e..414cb22c5 100644 +--- a/src/qwt_plot_glcanvas.cpp ++++ b/src/qwt_plot_glcanvas.cpp +@@ -15,6 +15,7 @@ + #include <qdrawutil.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <QPainterPath>
+
+ #define FIX_GL_TRANSLATION 0
+
+diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h +index 82770747f..be93232c4 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>
+
+ class QwtPlot;
+
+diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp +index bed4566dd..852998f01 100644 +--- a/src/qwt_plot_panner.cpp ++++ b/src/qwt_plot_panner.cpp +@@ -14,6 +14,7 @@ + #include <qbitmap.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <QPainterPath>
+
+ #if QT_VERSION >= 0x050000
+ #if QT_VERSION < 0x050100
+diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp +index b6c83447e..a309fe290 100644 +--- a/src/qwt_plot_renderer.cpp ++++ b/src/qwt_plot_renderer.cpp +@@ -26,6 +26,7 @@ + #include <qfileinfo.h>
+ #include <qimagewriter.h>
+ #include <qvariant.h>
++#include <QPainterPath>
+
+ #ifndef QWT_NO_SVG
+ #ifdef QT_SVG_LIB
+diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp +index 79c46ce10..f64042ac8 100644 +--- a/src/qwt_widget_overlay.cpp ++++ b/src/qwt_widget_overlay.cpp +@@ -13,6 +13,7 @@ + #include <qpaintengine.h>
+ #include <qimage.h>
+ #include <qevent.h>
++#include <QPainterPath>
+
+ static QImage::Format qwtMaskImageFormat()
+ {
+diff --git a/src/src.pri b/src/src.pri +index 571870361..412636d5b 100644 +--- a/src/src.pri ++++ b/src/src.pri +@@ -7,7 +7,7 @@ + # modify it under the terms of the Qwt License, Version 1.0
+ ################################################################
+
+-
++QT += gui
+ HEADERS += \
+ qwt.h \
+ qwt_abstract_scale_draw.h \
|
