From 34519d44ffd0327a676f6af41f63191912b583e6 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Fri, 27 Jan 2023 16:00:38 +0100 Subject: [PATCH] QtGui: Fix some macro clashes Macro Q_FIXED_POINT_SCALE in qpathssimplifier.cpp clashes with the macro with similar name in qtriangulator Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I02732ae62238e8b7fae0630764fdd33b6203afe3 Reviewed-by: Joerg Bornemann --- src/gui/painting/qpathsimplifier.cpp | 2 ++ src/gui/painting/qtriangulator.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gui/painting/qpathsimplifier.cpp b/src/gui/painting/qpathsimplifier.cpp index 36baccd3e4..969308f0bb 100644 --- a/src/gui/painting/qpathsimplifier.cpp +++ b/src/gui/painting/qpathsimplifier.cpp @@ -1635,3 +1635,5 @@ void qSimplifyPath(const QPainterPath &path, QDataBuffer &vertices, QT_END_NAMESPACE + +#undef Q_FIXED_POINT_SCALE diff --git a/src/gui/painting/qtriangulator.cpp b/src/gui/painting/qtriangulator.cpp index 86f3a2b20c..029566f1b9 100644 --- a/src/gui/painting/qtriangulator.cpp +++ b/src/gui/painting/qtriangulator.cpp @@ -2321,3 +2321,5 @@ QPolylineSet qPolyline(const QPainterPath &path, } QT_END_NAMESPACE + +#undef Q_FIXED_POINT_SCALE