Clean up and fix bug in merge conflict for 21099dac.
Clean up and fix bug in merge conflict for 21099dac.

Make use of QPolygonF::translated and QPainterPath::translated to ensure
all mapToParent functions follow the exact same pattern. This makes it
clear that the functions do the same and do it the same way.

Reviewed-by: bnilsen

pruiz/wkhtmltopdf-qt,radekp/qt,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,radekp/qt,igor-sfdc/qt-wk,radekp/qt,radekp/qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,radekp/qt,radekp/qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,radekp/qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,radekp/qt,pruiz/wkhtmltopdf-qt,radekp/qt,igor-sfdc/qt-wk,radekp/qt