Skip to content

Clear the _X version of alongside the enum deprecator

When QT_NO_DEPRECATED_WARNINGS is defined, we undefine Q_DECL_ENUMERATOR_DEPRECATED as it's used raw (rather than via an intermediary or version-variant). The same is true of its _X() variant, so do the same for this - which involves redefining it to a still function-like macro, so that its parameter gets ignored.

This amends commit 59b03992 (and shall get conflicts on older branches, before the defines in question moved to qtdeprecationmarkers.h in 6.5).

Pick-to: 5.15 6.2 6.5 6.6 Change-Id: If85c135cddbb33e93cb90f400af123c74e0298ac Reviewed-by: Ivan Solovev (cherry picked from commit ffaa1281)

  • asturmlechner 2023-08-14: Change applied in qglobal.h instead.

Merge request reports