Fix usage of API that is marked deprecated. Change-Id: Ib9a45e93084fb5b0d0d3aefd64b755dff7c696d6 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Change-Id: I871b0e7c1c4336b45e880023e7374f579e018cd6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>