Snap for 4790189 from 897eca5131fde8efeec2e07b8930846294126e0a to qt-release

Change-Id: Ie5a722a2d9f1e4de850b17c2a9b838af318994c3