Build with Qt6 again on environments where it is available. Drop cherry-picked patches that are part of the new release.