Ported from 4.8 2ccef4f57f036a486cb96904298a8b4673ff0aec

Change-Id: I01f6449ebdb610684d0aab3a37fe66ed0a37b522
Reviewed-on: http://codereview.qt.nokia.com/2256


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