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 <joerg.bornemann@qt.io>
2023-01-27 16:00:38 +01:00 · 2023-01-27 16:00:38 +01:00 · 34519d44ff
parent 115a38613c
commit 34519d44ff
2 changed files with 4 additions and 0 deletions
--- a/src/gui/painting/qpathsimplifier.cpp
+++ b/src/gui/painting/qpathsimplifier.cpp
@ -1635,3 +1635,5 @@ void qSimplifyPath(const QPainterPath &path, QDataBuffer<QPoint> &vertices,


 QT_END_NAMESPACE
+
+#undef Q_FIXED_POINT_SCALE
--- 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