Ported from 4.8 0b16c7a8a5522e3bc7414130dc609763bc2f4e3d
Change-Id: I0ca572dd3a096609ecf914a5df66e19b1fd51e6f
Reviewed-on: http://codereview.qt.nokia.com/2255


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>