aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-19 17:02:29 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-22 17:33:38 +0200
commit9c7507ef155d9c248b6d9b12349c52fa1410e482 (patch)
treeaf4e914fe7582afcdf38fcf9223ea4e429fd1513 /recipes-qt/qt5/qtwebengine
parent2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (diff)
qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch241
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch2
14 files changed, 19 insertions, 260 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 44c3f0b2..0e9ea724 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,4 +1,4 @@
-From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
+From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Thu, 24 Dec 2015 12:46:58 -0200
Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
index a91a2982..275ef9e8 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
+From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
From: Frieder Schrempf <frieder.schrempf@online.de>
Date: Mon, 1 Dec 2014 14:34:40 +0000
Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 6 insertions(+)
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index eb421f8b..4513742d 100644
+index 56894e58..ef418a4c 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
-@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
+@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
return(false)
}
gcc:!clang:!isGCCVersionSupported(): return(false)
diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index d5567c35..6ada3f94 100644
--- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,4 +1,4 @@
-From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
+From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Fri, 25 Dec 2015 18:16:05 -0200
Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index 2ecd70d7..703d1a92 100644
+index 19ecf5e1..f6f638ee 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -59,6 +59,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
index 5f9eb3a7..4a1a975f 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
+From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 15 Mar 2017 13:53:28 +0200
Subject: [PATCH] chromium: Force host toolchain configuration
diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
index 2fa1764d..8c0484bd 100644
--- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
-From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
+From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Thu, 24 Dec 2015 15:59:51 -0200
Subject: [PATCH] Include dependency to QCoreApplication::translate()
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 8785842a..d3c7a315 100644
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
-From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
+From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:01:12 -0700
Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
index 142595a3..258afd53 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001
+From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 15 Mar 2017 13:53:28 +0200
Subject: [PATCH] Force host toolchain configuration
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index fd27643e..f9acb6ff 100644
+index f1b3d47b..521c507b 100644
--- a/src/buildtools/configure_host.pro
+++ b/src/buildtools/configure_host.pro
-@@ -28,9 +28,9 @@ GN_CONTENTS = \
+@@ -29,9 +29,9 @@ GN_CONTENTS = \
"import(\"//build/config/sysroot.gni\")" \
"import(\"//build/toolchain/gcc_toolchain.gni\")" \
"gcc_toolchain(\"host\") {" \
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644
" ar = \"$$which(ar)\" " \
" nm = \"$$which(nm)\" " \
" toolchain_args = { " \
-@@ -41,9 +41,9 @@ GN_CONTENTS = \
+@@ -42,9 +42,9 @@ GN_CONTENTS = \
" } " \
"}" \
"gcc_toolchain(\"v8_snapshot\") {" \
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 05b813b2..71e36bbd 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
+From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:09:06 -0700
Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
diff --git a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch b/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
deleted file mode 100644
index c63086d5..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
-Date: Tue, 20 Jun 2017 15:36:43 +0200
-Subject: [PATCH] Always compile QWebEnginePage::print
-
-- Remove two out of five layers of ifdefs around and inside this method.
-- Now always compiled but will yield an error if printing is disabled.
-- Remove printing-related ifdefs from demobrowser.
-
-Task-number: QTBUG-61510
-Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Reviewed-by: Rolf Eike Beer <eb@emlix.com>
----
- examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------
- examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------
- examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 -------
- src/webenginewidgets/api/qwebenginepage.cpp | 10 ++--------
- src/webenginewidgets/api/qwebenginepage.h | 8 --------
- 5 files changed, 2 insertions(+), 41 deletions(-)
-
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-index 327d7a9d..14d49f7f 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
- , m_historyForward(0)
- , m_stop(0)
- , m_reload(0)
--#ifndef QT_NO_PRINTER
- , m_currentPrinter(nullptr)
--#endif
- {
- setToolButtonStyle(Qt::ToolButtonFollowStyle);
- setAttribute(Qt::WA_DeleteOnClose, true);
-@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
- #if defined(QWEBENGINEPAGE_PRINT)
- fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
- #endif
--#ifndef QT_NO_PRINTER
- fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
--#endif
- fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
- fileMenu->addSeparator();
-
-@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
-
- void BrowserMainWindow::slotFilePrintPreview()
- {
--#ifndef QT_NO_PRINTPREVIEWDIALOG
- if (!currentTab())
- return;
- QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
- connect(dialog, SIGNAL(paintRequested(QPrinter*)),
- currentTab(), SLOT(print(QPrinter*)));
- dialog->exec();
--#endif
- }
-
- void BrowserMainWindow::slotFilePrint()
- {
--#ifndef QT_NO_PRINTER
- if (!currentTab())
- return;
- printRequested(currentTab()->page());
--#endif
- }
-
- void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
-@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
- currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
- }
-
--#ifndef QT_NO_PRINTER
- void BrowserMainWindow::slotHandlePagePrinted(bool result)
- {
- Q_UNUSED(result);
-@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result)
-
- void BrowserMainWindow::printRequested(QWebEnginePage *page)
- {
--#ifndef QT_NO_PRINTDIALOG
- if (m_currentPrinter)
- return;
- m_currentPrinter = new QPrinter();
-@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page)
- return;
- }
- page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted));
--#endif
- }
--#endif
-
- void BrowserMainWindow::slotPrivateBrowsing()
- {
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h
-index 91e1c1d2..5bbbb292 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
-@@ -56,9 +56,7 @@
- #include <QtCore/QUrl>
-
- QT_BEGIN_NAMESPACE
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif
- class QWebEnginePage;
- QT_END_NAMESPACE
-
-@@ -142,10 +140,8 @@ private slots:
- void slotSwapFocus();
- void slotHandlePdfPrinted(const QByteArray&);
-
--#ifndef QT_NO_PRINTER
- void slotHandlePagePrinted(bool result);
- void printRequested(QWebEnginePage *page);
--#endif
- void geometryChangeRequested(const QRect &geometry);
- void updateToolbarActionText(bool visible);
- void updateBookmarksToolbarActionText(bool visible);
-@@ -180,9 +176,7 @@ private:
- QAction *m_restoreLastSession;
- QAction *m_addBookmark;
-
--#ifndef QT_NO_PRINTER
- QPrinter *m_currentPrinter;
--#endif
-
- QIcon m_reloadIcon;
- QIcon m_stopIcon;
-diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-index 0f3b1765..50a8bb91 100644
---- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-@@ -52,10 +52,8 @@
- #include "ui_printtopdfdialog.h"
-
- #include <QtCore/QDir>
--#ifndef QT_NO_PRINTER
- #include <QtPrintSupport/QPageSetupDialog>
- #include <QtPrintSupport/QPrinter>
--#endif // QT_NO_PRINTER
- #include <QtWidgets/QFileDialog>
-
- PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
-@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
- ui->setupUi(this);
- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked);
--#ifndef QT_NO_PRINTER
- connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked);
--#else
- ui->choosePageLayoutButton->hide();
--#endif // QT_NO_PRINTER
- updatePageLayoutLabel();
- setFilePath(filePath);
- }
-@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
-
- void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
- {
--#ifndef QT_NO_PRINTER
- QPrinter printer;
- printer.setPageLayout(currentPageLayout);
-
-@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
- currentPageLayout.setPageSize(printer.pageLayout().pageSize());
- currentPageLayout.setOrientation(printer.pageLayout().orientation());
- updatePageLayoutLabel();
--#endif // QT_NO_PRINTER
- }
-
- void PrintToPdfDialog::onChooseFilePathButtonClicked()
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index 82720ae3..20d3268c 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -80,11 +80,9 @@
- #include <QMenu>
- #include <QMessageBox>
- #include <QMimeData>
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
-+#ifdef ENABLE_PRINTING
- #include <QPrinter>
--#endif //QT_NO_PRINTER
--#endif //QT_PRINTSUPPORT_LIB
-+#endif
- #include <QStandardPaths>
- #include <QStyle>
- #include <QTimer>
-@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
- #endif // if defined(ENABLE_PDF)
- }
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- /*!
- \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback)
- Renders the current content of the page into a temporary PDF document, then prints it using \a printer.
-@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
- d->m_callbacks.invokeDirectly(resultCallback, false);
- #endif // if defined(ENABLE_PDF)
- }
--#endif // if defined(QT_NO_PRINTER)
--#endif // if defined(QT_PRINTSUPPORT_LIB)
-
- /*!
- \since 5.7
-diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
-index c7d5a19e..5619639c 100644
---- a/src/webenginewidgets/api/qwebenginepage.h
-+++ b/src/webenginewidgets/api/qwebenginepage.h
-@@ -55,11 +55,7 @@
-
- QT_BEGIN_NAMESPACE
- class QMenu;
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
- class QWebChannel;
- class QWebEngineContextMenuData;
-@@ -294,15 +290,11 @@ public:
- void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
- #endif
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- #ifdef Q_QDOC
- void print(QPrinter *printer, FunctorOrLambda resultCallback);
- #else
- void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback);
- #endif // QDOC
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
- const QWebEngineContextMenuData &contextMenuData() const;
-
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
index 2d7bd02b..00c875b0 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
-From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
+From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:37:49 -0700
Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index f58de8f2..085cb012 100644
--- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
-From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
+From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:38:37 -0700
Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
index c3b1cbb2..e23cabe3 100644
--- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
+From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:54:38 -0700
Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 550fd79e..53e8a817 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
-From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
+From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:09:02 -0700
Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 82a2ccc5..385e729d 100644
--- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
-From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
+From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:12:39 -0700
Subject: [PATCH] chromium: musl: Use correct member name __si_fields from