713745e6cb
* Fix build failures against Qt 5.15 (see current staging:adi:100) with upstream patch * Get around %cmake's RPATH weirdness for Leap to make builds successful again. * Disbale pegtl module when pegtl >= 2.0 is unavailable (Leap 15.1). * Disable java bindings for Leap 15.1 due to inavailability of javah. OBS-URL: https://build.opensuse.org/request/show/810514 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=157
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
|
|
From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
|
|
Date: Wed, 27 May 2020 15:27:15 +1000
|
|
Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
|
|
|
|
---
|
|
Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
|
|
Rendering/Qt/vtkQtStringToImage.cxx | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
|
|
index afda585cca..eca65c64cd 100644
|
|
--- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
|
|
+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
|
|
@@ -41,6 +41,7 @@
|
|
#include <QImage>
|
|
#include <QMap>
|
|
#include <QPainter>
|
|
+#include <QPainterPath>
|
|
#include <QPair>
|
|
#include <QPixmap>
|
|
#include <QTextDocument>
|
|
diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx
|
|
index 659c71570e..fbb9b78f05 100644
|
|
--- a/Rendering/Qt/vtkQtStringToImage.cxx
|
|
+++ b/Rendering/Qt/vtkQtStringToImage.cxx
|
|
@@ -30,6 +30,7 @@
|
|
#include <QFontMetrics>
|
|
#include <QImage>
|
|
#include <QPainter>
|
|
+#include <QPainterPath>
|
|
#include <QPixmap>
|
|
#include <QString>
|
|
#include <QTextDocument>
|
|
--
|
|
2.26.2
|