Snap for 5480912 from 8c5239a242a06ab0f1a5653d3aed515bf6037fb9 to qt-release

Change-Id: I000a3880ed198f64ac38db3643e0747a5e5ebcf6