Even more Windows build fix and a Qt minimal build fix attempt.