Changes to address QTBUG-96121 did not consider that macros introduce another level of escaping that functions do not. Converting the versionless wrapper functions to macros therefore introduced a potential behavior change. Those changes need to be reverted and an alternate fix applied for addressing the silent swallowing of output arguments by the wrappers.

See upstream CMake issue: https://gitlab.kitware.com/cmake/cmake/-/issues/19972