diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:43:46 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:44:03 +0200 |
commit | 166c2499d989919a037a599942fb95beb362971e (patch) | |
tree | 748e58d2ed42422aae1e32a28f57180f5bb1cbea /src/printsupport/kernel/qprinter.cpp | |
parent | f7047d52da47a8426189d0aff8c5104b23cbfd89 (diff) | |
parent | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (diff) |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553
Diffstat (limited to 'src/printsupport/kernel/qprinter.cpp')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 246dae0ddf..a106a58502 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1764,7 +1764,7 @@ QRectF QPrinter::paperRect(Unit unit) const } /*! - \obsolete Use pageLayout().paintRect() instead. + \obsolete Use pageLayout().paintRectPixels(resolution()) instead. Returns the page's rectangle; this is usually smaller than the paperRect() since the page normally has margins between its @@ -1781,7 +1781,7 @@ QRect QPrinter::pageRect() const } /*! - \obsolete Use pageLayout().fullPageRect() instead. + \obsolete Use pageLayout().fullRectPixels(resolution()) instead. Returns the paper's rectangle; this is usually larger than the pageRect(). |