This hybrid "do everything on master" approach was easy at first, but
doesn't scale well as more changes become required.

We'll put the Qt6 version code in a new separate branch called "kf6"

Reverts 906b7ad8.