This change is extracted from qtpdf branch to keep following
commits unchanged.

Change-Id: I255976d45213d4cfe84243cae0b4eddb8eb1747a
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>