diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-08 13:11:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-22 14:23:30 +0000 |
| commit | a693cae520455ece9bf860ab2804f03d465d51af (patch) | |
| tree | 530c06f750c0554af3e46f368be96f7fe80cadb2 /src/webenginequick | |
| parent | 3752a3cbcd0cc0742a5b955e925df18395afdb75 (diff) | |
Add QPageRanges to PDF printing
Task-number: QTBUG-73497
Change-Id: I0a66c4f1767c54b0bcc9f9a3b61e29c43ec20177
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0887e880ced988704559505816b520972e6876c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index abfd0b79f..f62ff361a 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -82,6 +82,7 @@ #include <QMarginsF> #include <QMimeData> #include <QPageLayout> +#include <QPageRanges> #include <QPageSize> #include <QQmlComponent> #include <QQmlContext> @@ -1434,8 +1435,9 @@ void QQuickWebEngineView::printToPdf(const QString& filePath, PrintedPageSizeId QPageSize layoutSize(static_cast<QPageSize::PageSizeId>(pageSizeId)); QPageLayout::Orientation layoutOrientation = static_cast<QPageLayout::Orientation>(orientation); QPageLayout pageLayout(layoutSize, layoutOrientation, QMarginsF(0.0, 0.0, 0.0, 0.0)); + QPageRanges ranges; d->ensureContentsAdapter(); - d->adapter->printToPDF(pageLayout, filePath); + d->adapter->printToPDF(pageLayout, ranges, filePath); #else Q_UNUSED(filePath); Q_UNUSED(pageSizeId); @@ -1450,12 +1452,13 @@ void QQuickWebEngineView::printToPdf(const QJSValue &callback, PrintedPageSizeId QPageSize layoutSize(static_cast<QPageSize::PageSizeId>(pageSizeId)); QPageLayout::Orientation layoutOrientation = static_cast<QPageLayout::Orientation>(orientation); QPageLayout pageLayout(layoutSize, layoutOrientation, QMarginsF(0.0, 0.0, 0.0, 0.0)); + QPageRanges ranges; if (callback.isUndefined()) return; d->ensureContentsAdapter(); - quint64 requestId = d->adapter->printToPDFCallbackResult(pageLayout); + quint64 requestId = d->adapter->printToPDFCallbackResult(pageLayout, ranges); d->m_callbacks.insert(requestId, callback); #else Q_UNUSED(pageSizeId); |