Now that we have the infrastructure to handle both separately it makes no more sense to merge them. Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Change-Id: Iebeae1f52cf856e009a0910118829c89dd3ea222 Reviewed-by: hjk <hjk121@nokiamail.com>