Fix more regressions due to new Qt modules approach.

Change-Id: I7e3ebad2730f08371a4036439fcc3b3c3d82be5c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>