fix build in OBS, as well as fixes for API changes.

Change-Id: I27eabe7c8b79e03d814deb541db5e7f0b5449099
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>