Make code more similar for later sharing. Change-Id: I260e10ba1b613dfcebc45bb1a268b6fcebbde353 Reviewed-by: hjk <hjk@qt.io>