diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-12-15 22:43:18 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-12-16 13:13:46 +0100 |
| commit | cbff2c7b67977b8a949db259ebc7c83fc7076139 (patch) | |
| tree | cb2a576d0b054def672a5ff51adc93fb9ec18691 | |
| parent | 03b57bb162069a61049028dec88376a7d0b8dda8 (diff) | |
Add, #undef for macros defined by
a691a214cd563dcc6e2e251154fd7f1703c0253d.
Task-number: QTBUG-109394
Pick-to: 6.11
Change-Id: I3691124f88055d1c4140177a3183760096d6dca1
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
| -rw-r--r-- | src/canvaspainter/qcboxgradient.cpp | 3 | ||||
| -rw-r--r-- | src/canvaspainter/qcconicalgradient.cpp | 3 | ||||
| -rw-r--r-- | src/canvaspainter/qcgradient.cpp | 2 | ||||
| -rw-r--r-- | src/canvaspainter/qcgridpattern.cpp | 3 | ||||
| -rw-r--r-- | src/canvaspainter/qcimagepattern.cpp | 2 | ||||
| -rw-r--r-- | src/canvaspainter/qclineargradient.cpp | 3 | ||||
| -rw-r--r-- | src/canvaspainter/qcradialgradient.cpp | 3 |
7 files changed, 19 insertions, 0 deletions
diff --git a/src/canvaspainter/qcboxgradient.cpp b/src/canvaspainter/qcboxgradient.cpp index 583f381..4dcecc9 100644 --- a/src/canvaspainter/qcboxgradient.cpp +++ b/src/canvaspainter/qcboxgradient.cpp @@ -271,4 +271,7 @@ void QCBoxGradientPrivate::createBoxGradient(const QColor &iColor, const QColor } } +#undef G_D +#undef DECONST + QT_END_NAMESPACE diff --git a/src/canvaspainter/qcconicalgradient.cpp b/src/canvaspainter/qcconicalgradient.cpp index 09c6ead..1497279 100644 --- a/src/canvaspainter/qcconicalgradient.cpp +++ b/src/canvaspainter/qcconicalgradient.cpp @@ -222,4 +222,7 @@ void QCConicalGradientPrivate::createConicalGradient(const QColor &iColor, const } } +#undef G_D +#undef DECONST + QT_END_NAMESPACE diff --git a/src/canvaspainter/qcgradient.cpp b/src/canvaspainter/qcgradient.cpp index 90ffa95..418d8a2 100644 --- a/src/canvaspainter/qcgradient.cpp +++ b/src/canvaspainter/qcgradient.cpp @@ -454,4 +454,6 @@ void QCGradientPrivate::updateGradientTexture(QCPainter *painter) } } +#undef G_D + QT_END_NAMESPACE diff --git a/src/canvaspainter/qcgridpattern.cpp b/src/canvaspainter/qcgridpattern.cpp index d8404a1..ade79fc 100644 --- a/src/canvaspainter/qcgridpattern.cpp +++ b/src/canvaspainter/qcgridpattern.cpp @@ -480,4 +480,7 @@ QCBrushPrivate *QCGridPatternPrivate::clone() return new QCGridPatternPrivate(*this); } +#undef G_D +#undef DECONST + QT_END_NAMESPACE diff --git a/src/canvaspainter/qcimagepattern.cpp b/src/canvaspainter/qcimagepattern.cpp index a4a2848..0a6e268 100644 --- a/src/canvaspainter/qcimagepattern.cpp +++ b/src/canvaspainter/qcimagepattern.cpp @@ -427,4 +427,6 @@ QCBrushPrivate *QCImagePatternPrivate::clone() return new QCImagePatternPrivate(*this); } +#undef DECONST + QT_END_NAMESPACE diff --git a/src/canvaspainter/qclineargradient.cpp b/src/canvaspainter/qclineargradient.cpp index 5a898c9..6a7472e 100644 --- a/src/canvaspainter/qclineargradient.cpp +++ b/src/canvaspainter/qclineargradient.cpp @@ -251,4 +251,7 @@ void QCLinearGradientPrivate::createLinearGradient(const QColor &iColor, const Q } } +#undef G_D +#undef DECONST + QT_END_NAMESPACE diff --git a/src/canvaspainter/qcradialgradient.cpp b/src/canvaspainter/qcradialgradient.cpp index ace06f6..7c64d27 100644 --- a/src/canvaspainter/qcradialgradient.cpp +++ b/src/canvaspainter/qcradialgradient.cpp @@ -256,4 +256,7 @@ void QCRadialGradientPrivate::createRadialGradient(const QColor &iColor, const Q } } +#undef G_D +#undef DECONST + QT_END_NAMESPACE |