Only use the user set page margins for custom paper
authorAndy Shaw <andy.shaw@digia.com>
Thu, 25 Oct 2012 04:43:01 +0000 (06:43 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 30 Oct 2012 11:53:46 +0000 (12:53 +0100)
commit50ec06da2c8a1c680d48b84f8c1267fe78a86b6a
treec31c6015dd0ba3cad1fe194ee5e77a19e5798fc5
parentbf722c1ab387e8892242dcaacd8afd36d592ebb6
Only use the user set page margins for custom paper

When the QPrinter is initalized then it will set up page margins based
on the default paper size. If the paper size is changed to be a custom
one then it should disregard the margins for the default paper size.

If the page margins are set explicitly beforehand then it will use these
page margins.

Change-Id: Ic535c3a80b8b217dbd5eb5f4fb2cbc0ab1354563
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
src/plugins/platforms/cocoa/qprintengine_mac.mm
src/printsupport/kernel/qprintengine_pdf.cpp
src/printsupport/kernel/qprintengine_pdf_p.h
src/printsupport/kernel/qprintengine_win.cpp
tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp