WIP: upstream rebase

I rebased agains the upstream master, I hope this is not a problem. But it shouldn't be to much work to rebase against the latest release, though. I also have seen your upstream MR, fixing some legacy Qt version stuff, but I don't know if that helps with the build.rs adjustment I had to make to get it build in the SDKs docker container.