diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-21 11:32:35 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-10 09:15:57 +0000 |
commit | 41e1ac9e6e1f1d98a5901253e89d7b524d3cdf6b (patch) | |
tree | 670da9c340426fad3ddcd226ecfe4ba7e696792e /tests/auto/widgets/printing/tst_printing.cpp | |
parent | 36ef2b73fb5b8ba75ec0926dc3ffde2f0487c5d5 (diff) |
Return printToPdf to QWebEnginePage
It doesn't use QPrinter and can be done using QtGui classes only.
Change-Id: I0e14563c1bb5e93d9803bb1a807f702b1a2a5315
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit b405ed26336a44ad4f359cdb4e1909e31c113cd4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/widgets/printing/tst_printing.cpp')
-rw-r--r-- | tests/auto/widgets/printing/tst_printing.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/widgets/printing/tst_printing.cpp b/tests/auto/widgets/printing/tst_printing.cpp index 3f1344ed4..0559fb787 100644 --- a/tests/auto/widgets/printing/tst_printing.cpp +++ b/tests/auto/widgets/printing/tst_printing.cpp @@ -58,10 +58,10 @@ void tst_Printing::printToPdfBasic() view.load(QUrl("qrc:///resources/basic_printing_page.html")); QTRY_VERIFY(spy.count() == 1); - QSignalSpy savePdfSpy(&view, &QWebEngineView::pdfPrintingFinished); + QSignalSpy savePdfSpy(view.page(), &QWebEnginePage::pdfPrintingFinished); QPageLayout layout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0.0, 0.0, 0.0, 0.0)); QString path = tempDir.path() + "/print_1_success.pdf"; - view.printToPdf(path, layout); + view.page()->printToPdf(path, layout); QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal"); QList<QVariant> successArguments = savePdfSpy.takeFirst(); @@ -73,7 +73,7 @@ void tst_Printing::printToPdfBasic() #else path = tempDir.path() + "/print_|2_failed.pdf"; #endif - view.printToPdf(path, QPageLayout()); + view.page()->printToPdf(path, QPageLayout()); QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal"); QList<QVariant> failedArguments = savePdfSpy.takeFirst(); @@ -81,11 +81,11 @@ void tst_Printing::printToPdfBasic() QVERIFY2(failedArguments.at(1).toBool() == false, "Printing to PDF file succeeded though it should fail"); CallbackSpy<QByteArray> successfulSpy; - view.printToPdf(successfulSpy.ref(), layout); + view.page()->printToPdf(successfulSpy.ref(), layout); QVERIFY(successfulSpy.waitForResult().length() > 0); CallbackSpy<QByteArray> failedInvalidLayoutSpy; - view.printToPdf(failedInvalidLayoutSpy.ref(), QPageLayout()); + view.page()->printToPdf(failedInvalidLayoutSpy.ref(), QPageLayout()); QCOMPARE(failedInvalidLayoutSpy.waitForResult().length(), 0); } @@ -95,6 +95,7 @@ void tst_Printing::printRequest() QPageLayout layout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0.0, 0.0, 0.0, 0.0)); QSignalSpy loadFinishedSpy(&view, &QWebEngineView::loadFinished); QSignalSpy printRequestedSpy(&view, &QWebEngineView::printRequested); + QSignalSpy printRequestedSpy2(view.page(), &QWebEnginePage::printRequested); QSignalSpy savePdfSpy(&view, &QWebEngineView::pdfPrintingFinished); CallbackSpy<QByteArray> resultSpy; @@ -102,6 +103,7 @@ void tst_Printing::printRequest() QTRY_VERIFY(loadFinishedSpy.count() == 1); view.page()->runJavaScript("window.print()"); QTRY_VERIFY(printRequestedSpy.count() == 1); + QVERIFY(printRequestedSpy2.count() == 1); //check if printing still works view.printToPdf(resultSpy.ref(), layout); const QByteArray data = resultSpy.waitForResult(); |