PyQt Cleanup

To let the bots test this mess.

Tweaked version of #26540.