Mostly left-overs from earlier reorganization. Change-Id: I94f44efa1aab1e17de3c0fec6c230722149a1404 Reviewed-by: hjk <hjk@qt.io>