Snap for 4874590 from cedfbe901179abef6574ea2b7028fdddb5d85f26 to qt-release

Change-Id: Ibde14689728e051a829b1da22252f650f9a4c26d