diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:41:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:41:50 (GMT) |
| commit | aa482dcbde0089fe32ca59e39f17e5e44fd8b244 (patch) | |
| tree | ab780e2f6ac7197fc67440c2b7fb9328dbebd4f7 /src/gui/text/qtextdocument.cpp | |
| parent | 4712a3a1ff6192f716d4f6894c6e69386ae55411 (diff) | |
| parent | b2d5f886b36b4f4d317024db7cfd6668e2895cd4 (diff) | |
| download | Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.zip Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.tar.gz Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/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) { |