Merge "Make NetworkStack actually build in an unbundled setup." into qt-dev