* incl. unit test

Change-Id: Id56f713104cf05cb25fc788fa8b06a9df90b417b
Reviewed-on: http://codereview.qt-project.org/5398


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>