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: Ieeeec4d1a023b7cca19e3bd23ba1aa6dd1d76e72 Reviewed-by: Daniel Teske <daniel.teske@digia.com>