CI/build system adjustments for KF6
This doesn't fix the build, but it brings things back into a state where the open merge requests have a chance to do that again.
This doesn't fix the build, but it brings things back into a state where the open merge requests have a chance to do that again.