Fixes the problem 5426c3ac and
7b25f438 worked around.

Reviewed-by: Erik Verbruggen
(cherry picked from commit e2131113)
Change-Id: I5426c3ac2cdf898ca1190a7746ba506ff24abc50xx
Reviewed-on: http://codereview.qt.nokia.com/381


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