diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 16:43:48 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 16:43:48 (GMT) |
| commit | cb5e66d1d43c0cf452aff0e437a2ea9011c6b659 (patch) | |
| tree | 0aa5378385a5492e4fe55c7b7003cd32f83bf6b6 /src/gui/text/qtextdocument.cpp | |
| parent | 798ff84b2bd26da5ba2d01bf44e4a4d40dfcacac (diff) | |
| parent | 334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff) | |
| download | Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.zip Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.gz Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 1aad385..048325c 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -64,6 +64,7 @@ #include "qtextdocument_p.h" #include <private/qprinter_p.h> +#include <private/qabstracttextdocumentlayout_p.h> #include <limits.h> @@ -1722,6 +1723,9 @@ void QTextDocument::print(QPrinter *printer) const QAbstractTextDocumentLayout *layout = doc->documentLayout(); layout->setPaintDevice(p.device()); + // copy the custom object handlers + layout->d_func()->handlers = documentLayout()->d_func()->handlers; + int dpiy = p.device()->logicalDpiY(); int margin = 0; if (printer->fullPage() && !printer->d_func()->hasCustomPageMargins) { |