diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:51:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:58:16 +0100 |
| commit | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (patch) | |
| tree | a0517ae1e290e7bbdb118c9f01f4e6e5d744998c /src/gui/text/qtextdocument.cpp | |
| parent | c214379156e4c75dcfe59cf73d69b912f4293303 (diff) | |
| parent | 246fe271878dbe586b5f3222a78d67dfecd1ca83 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
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 bb44c19557..3a751e64cc 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1766,6 +1766,10 @@ QTextBlock QTextDocument::lastBlock() const \property QTextDocument::pageSize \brief the page size that should be used for laying out the document + The units are determined by the underlying paint device. The size is + measured in logical pixels when painting to the screen, and in points + (1/72 inch) when painting to a printer. + By default, for a newly-created, empty document, this property contains an undefined size. |