From 21362fd24443d021bfd9c85fac0b47eae32076cc Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amir.abdol@qt.io>
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

Task-number: QTBUG-109394
Change-Id: I02732ae62238e8b7fae0630764fdd33b6203afe3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 34519d44ffd0327a676f6af41f63191912b583e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 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 36baccd3e40..969308f0bbb 100644
--- 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
diff --git a/src/gui/painting/qtriangulator.cpp b/src/gui/painting/qtriangulator.cpp
index 86f3a2b20c2..029566f1b9a 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