This depends on https://codereview.qt-project.org/#change,28044
and https://codereview.qt-project.org/#change,28047



Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>