Fix framwork linking for Quartz support

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'quartz' into quartz-test