From b60ab85bf26d2da6a87df4195f13755c2b7fdf09 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 20 Mar 2018 13:01:42 +0000 Subject: Fix graphics/dspdfviewer build with modern Clang. The error message is in the (new) patch. PR: 226524 Approved by: tcberner (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D14652 --- graphics/dspdfviewer/files/patch-hyperlinkarea.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 graphics/dspdfviewer/files/patch-hyperlinkarea.cpp (limited to 'graphics/dspdfviewer') diff --git a/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp b/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp new file mode 100644 index 000000000000..9425de3dea17 --- /dev/null +++ b/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp @@ -0,0 +1,18 @@ +Fix build with modern Clang + +../hyperlinkarea.cpp:35:18: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant] + if ( pixmap == 0 ) + ^ + nullptr + +--- hyperlinkarea.cpp.orig 2018-03-11 12:58:40 UTC ++++ hyperlinkarea.cpp +@@ -32,7 +32,7 @@ HyperlinkArea::HyperlinkArea(QLabel* ima + throw WrongLinkType(); + QRect mySize; + const QPixmap* pixmap = imageLabel->pixmap(); +- if ( pixmap == 0 ) ++ if ( pixmap == nullptr ) + throw /** FIXME Exception **/ std::runtime_error("Tried to construct a HyperlinkArea from an image label without a pixmap"); + + QRectF sizeWithinImageLabel = link.linkArea(); -- cgit v1.2.3