Merge pull request #273 from ferama/master

fix wrong pdf margins using custom header/footer
1.6
Ariya Hidayat 2012-06-18 06:53:29 -07:00
commit c3c65df12d
1 changed files with 3 additions and 2 deletions

View File

@ -1441,11 +1441,12 @@ void QWebFrame::print(QPrinter* printer) const
void QWebFrame::print(QPrinter *printer, PrintCallback *callback) const
{
QPainter painter;
if (!painter.begin(printer))
return;
HeaderFooter headerFooter(this, printer, callback);
if (!painter.begin(printer))
return;
const qreal zoomFactorX = (qreal)printer->logicalDpiX() / qt_defaultDpi();
const qreal zoomFactorY = (qreal)printer->logicalDpiY() / qt_defaultDpi();