diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-04-05 14:02:13 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2016-04-13 08:23:58 +0000 |
| commit | a3d2ee4eabc4e491ac64976aea47c2bdf650cabe (patch) | |
| tree | 606573cf4d8825b96759f08bd82aa303a1cf623e /src/webengine/api | |
| parent | 22a550303618202135e58f5673e7b8935d578687 (diff) | |
Remove default values for printToPdf callbacks and unify API.
Adds default QPageLayout values.
Change-Id: Ibf2964ecd86350a51d682e385973f830ac4347a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 99d6cc746..a3d37f83a 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1210,7 +1210,7 @@ void QQuickWebEngineView::printToPdf(const QString& filePath, PrintedPageSizeId d->adapter->printToPDF(pageLayout, filePath); } -void QQuickWebEngineView::printToPdf(PrintedPageSizeId pageSizeId, PrintedPageOrientation orientation, const QJSValue &callback) +void QQuickWebEngineView::printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId, PrintedPageOrientation orientation) { Q_D(QQuickWebEngineView); QPageSize layoutSize(static_cast<QPageSize::PageSizeId>(pageSizeId)); diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 7a23e3011..065e7c529 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -475,7 +475,7 @@ public Q_SLOTS: Q_REVISION(2) void setActiveFocusOnPress(bool arg); Q_REVISION(2) void triggerWebAction(WebAction action); Q_REVISION(3) void printToPdf(const QString &filePath, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait); - Q_REVISION(3) void printToPdf(PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait, const QJSValue &callback = QJSValue()); + Q_REVISION(3) void printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait); #if !defined(QT_NO_SPELLCHECK) Q_REVISION(3) void replaceMisspelledWord(const QString &replacement); |