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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index 6033381b58..686dab07bf 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -335,8 +335,8 @@ void QPrintPreviewWidgetPrivate::populateScene() pages.clear(); int numPages = pictures.count(); - QSize paperSize = printer->paperRect().size(); - QRect pageRect = printer->pageRect(); + QSize paperSize = printer->pageLayout().fullRectPixels(printer->resolution()).size(); + QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution()); for (int i = 0; i < numPages; i++) { PageItem* item = new PageItem(i+1, pictures.at(i), paperSize, pageRect); |