(cherry picked from commit 3112c23c702ee36ba1c25ccb526240ab7dda5b2e)

Change-Id: I3112c23c702ee36ba1c25ccb526240ab7dda5b2ex
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/397


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>