Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10

Merge-request: !1432