From b405ed26336a44ad4f359cdb4e1909e31c113cd4 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 21 Jul 2021 11:32:35 +0200
Subject: Return printToPdf to QWebEnginePage

It doesn't use QPrinter and can be done using QtGui classes only.

Pick-to: 6.2
Change-Id: I0e14563c1bb5e93d9803bb1a807f702b1a2a5315
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
---
 src/webenginewidgets/api/qwebengineview_p.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/webenginewidgets/api/qwebengineview_p.h')

diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index db22c95b5..13b346df9 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -94,7 +94,7 @@ public:
     QWebEngineContextMenuRequest *lastContextMenuRequest() const override;
     QWebEnginePage *createPageForWindow(QWebEnginePage::WebWindowType type) override;
     QObject *accessibilityParentObject() override;
-    void didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result) override;
+    void didPrintPage(QPrinter *&printer, QSharedPointer<QByteArray> result) override;
     void didPrintPageToPdf(const QString &filePath, bool success) override;
     void printRequested() override;
 
@@ -114,10 +114,6 @@ public:
     bool m_dragEntered;
     mutable bool m_ownsPage;
     QWebEngineContextMenuRequest *m_contextRequest;
-#if QT_CONFIG(webengine_printing_and_pdf)
-    QPrinter *currentPrinter;
-#endif
-    QMap<quint64, std::function<void(const QByteArray&)>> m_pdfResultCallbacks;
 };
 
 #ifndef QT_NO_ACCESSIBILITY
-- 
cgit v1.2.3