Merge branch 'doc-qhelpgenerator' into release-3.22

Merge-request: !7150