Clean up some lingering differences from upstream #72

Job	Run time
Build Debug / flatpak	14m 28s
Build Debug / Nix (x86_64-linux)	17m 20s
Build Debug / build (ubuntu-20.04, 5, linux, 5.12.8, qtnetworkauth)	4m 13s
Build Debug / Nix (x86_64-darwin)	15m 13s
Build Debug / build (ubuntu-20.04, 6, linux, 6.2.4, qt5compat qtimageformats qtnetworkauth)	6m 37s
Build Debug / Nix (aarch64-darwin)	9m 25s
Build Debug / build (windows-2022, Windows-MinGW-w64, clang64, amd64_x86)	13m 43s
Build Debug / build (windows-2022, Windows-MSVC, x64, amd64, 6, windows, 6.7.3, qt5compat qtimageformats qtnetw...	3m 28s
Build Debug / build (windows-2022, Windows-MSVC-arm64, arm64, amd64_arm64, 6, windows, win64_msvc2019_arm64, 6....	3m 29s
Build Debug / build (macos-14, macOS, 11, 6, mac, 6.7.3, qt5compat qtimageformats qtnetworkauth)	9m 28s
Build Debug / build (macos-14, macOS-Legacy, 10.13, 5, mac, 5.15.2, qtnetworkauth)	4m 27s
	1h 41m 51s

Provide feedback