diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-01-27 16:00:38 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-07 18:59:57 +0100 |
| commit | 34519d44ffd0327a676f6af41f63191912b583e6 (patch) | |
| tree | 6dddc01fb32b649d127fd391fc589bae23944eb9 | |
| parent | 115a38613c0ed0ea1d6c82d927809074cb69f385 (diff) | |
| download | qtbase-34519d44ffd0327a676f6af41f63191912b583e6.tar.gz | |
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>
| -rw-r--r-- | src/gui/painting/qpathsimplifier.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qtriangulator.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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<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 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 |