diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-25 09:49:47 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-26 19:53:54 +0200 |
commit | 18bd22656418e269ee57024a966bbc2fef70db36 (patch) | |
tree | fc84ae16568ed8f47bc0abfec011b4ebb1ae7d53 /tests/manual/dialogs/printdialogpanel.cpp | |
parent | b0b4fcd05cd5ae891da868829c1645acf7589acb (diff) |
Fix compilation of some manual tests
- qtabletevent/device_information
- dialogs
- windowflags
Change-Id: Id3e4b2aec2a873b00dcda39fb1227b24832181ca
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/manual/dialogs/printdialogpanel.cpp')
-rw-r--r-- | tests/manual/dialogs/printdialogpanel.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp index 29dc33285b..338064e9be 100644 --- a/tests/manual/dialogs/printdialogpanel.cpp +++ b/tests/manual/dialogs/printdialogpanel.cpp @@ -157,17 +157,19 @@ QTextStream &operator<<(QTextStream &s, const QRectF &rect) QTextStream &operator<<(QTextStream &s, const QPrinter &printer) { - s << '"' << printer.printerName() << "\"\nPaper #" <<printer.paperSize() - << " \"" << printer.paperName() << '"' - << (printer.orientation() == QPrinter::Portrait ? ", Portrait" : ", Landscape"); + const auto pageLayout = printer.pageLayout(); + const auto pageSize = pageLayout.pageSize(); + s << '"' << printer.printerName() << "\"\nPaper #" << pageSize.id() + << " \"" << pageSize.name() << '"' + << (pageLayout.orientation() == QPageLayout::Portrait ? ", Portrait" : ", Landscape"); if (printer.fullPage()) s << ", full page"; s << "\nPaper size: " - << printer.paperSize(QPrinter::Point) << "pt " - << printer.paperSize(QPrinter::Millimeter) << "mm " - << "\n " << printer.paperSize(QPrinter::DevicePixel) << "device pt " - << printer.paperSize(QPrinter::Inch) << "inch " - << "\nPagedPaintDevSize: " << printer.pageSizeMM() << "mm" + << pageSize.sizePoints() << "pt " + << pageSize.size(QPageSize::Millimeter) << "mm " + << "\n " << pageSize.sizePixels(printer.resolution()) << " device pt " + << pageSize.size(QPageSize::Inch) << "inch " + << "\n " << pageSize.size(QPageSize::Millimeter) << "mm" << "\nLogical resolution : " << printer.logicalDpiX() << ',' << printer.logicalDpiY() << "DPI" << "\nPhysical resolution: " << printer.physicalDpiX() << ',' << printer.physicalDpiY() << "DPI" << "\nPaperRect: " << printer.paperRect(QPrinter::Point) << "pt " @@ -236,7 +238,7 @@ static bool print(QPrinter *printer, QString *errorMessage) return false; } - const QRectF pageF = printer->pageRect(); + const QRectF pageF = printer->pageRect(QPrinter::DevicePixel); QFont font = painter.font(); font.setFamily("Courier"); |