diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
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 @@ | |||
1 | From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001 | 1 | From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 | 3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 |
4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX | 4 | 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 @@ | |||
1 | From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001 | 1 | From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf | 14 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf |
15 | index eb421f8b..4513742d 100644 | 15 | index 56894e58..ef418a4c 100644 |
16 | --- a/mkspecs/features/functions.prf | 16 | --- a/mkspecs/features/functions.prf |
17 | +++ b/mkspecs/features/functions.prf | 17 | +++ b/mkspecs/features/functions.prf |
18 | @@ -33,6 +33,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { |
19 | return(false) | 19 | return(false) |
20 | } | 20 | } |
21 | gcc:!clang:!isGCCVersionSupported(): return(false) | 21 | 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 @@ | |||
1 | From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001 | 1 | From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor |
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
12 | index 2ecd70d7..703d1a92 100644 | 12 | index 19ecf5e1..f6f638ee 100644 |
13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
15 | @@ -59,6 +59,8 @@ | 15 | @@ -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 @@ | |||
1 | From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001 | 1 | From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | 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 @@ | |||
1 | From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001 | 1 | From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() | 4 | 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 @@ | |||
1 | From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001 | 1 | From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | 3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 |
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | 4 | 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 @@ | |||
1 | From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 | 1 | From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
13 | 1 file changed, 6 insertions(+), 6 deletions(-) | 13 | 1 file changed, 6 insertions(+), 6 deletions(-) |
14 | 14 | ||
15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
16 | index fd27643e..f9acb6ff 100644 | 16 | index f1b3d47b..521c507b 100644 |
17 | --- a/src/buildtools/configure_host.pro | 17 | --- a/src/buildtools/configure_host.pro |
18 | +++ b/src/buildtools/configure_host.pro | 18 | +++ b/src/buildtools/configure_host.pro |
19 | @@ -28,9 +28,9 @@ GN_CONTENTS = \ | 19 | @@ -29,9 +29,9 @@ GN_CONTENTS = \ |
20 | "import(\"//build/config/sysroot.gni\")" \ | 20 | "import(\"//build/config/sysroot.gni\")" \ |
21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | 21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ |
22 | "gcc_toolchain(\"host\") {" \ | 22 | "gcc_toolchain(\"host\") {" \ |
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644 | |||
29 | " ar = \"$$which(ar)\" " \ | 29 | " ar = \"$$which(ar)\" " \ |
30 | " nm = \"$$which(nm)\" " \ | 30 | " nm = \"$$which(nm)\" " \ |
31 | " toolchain_args = { " \ | 31 | " toolchain_args = { " \ |
32 | @@ -41,9 +41,9 @@ GN_CONTENTS = \ | 32 | @@ -42,9 +42,9 @@ GN_CONTENTS = \ |
33 | " } " \ | 33 | " } " \ |
34 | "}" \ | 34 | "}" \ |
35 | "gcc_toolchain(\"v8_snapshot\") {" \ | 35 | "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 @@ | |||
1 | From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001 | 1 | From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | 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 @@ | |||
1 | From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io> | ||
3 | Date: Tue, 20 Jun 2017 15:36:43 +0200 | ||
4 | Subject: [PATCH] Always compile QWebEnginePage::print | ||
5 | |||
6 | - Remove two out of five layers of ifdefs around and inside this method. | ||
7 | - Now always compiled but will yield an error if printing is disabled. | ||
8 | - Remove printing-related ifdefs from demobrowser. | ||
9 | |||
10 | Task-number: QTBUG-61510 | ||
11 | Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86 | ||
12 | Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> | ||
13 | Reviewed-by: Rolf Eike Beer <eb@emlix.com> | ||
14 | --- | ||
15 | examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------ | ||
16 | examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------ | ||
17 | examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 ------- | ||
18 | src/webenginewidgets/api/qwebenginepage.cpp | 10 ++-------- | ||
19 | src/webenginewidgets/api/qwebenginepage.h | 8 -------- | ||
20 | 5 files changed, 2 insertions(+), 41 deletions(-) | ||
21 | |||
22 | diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp | ||
23 | index 327d7a9d..14d49f7f 100644 | ||
24 | --- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp | ||
25 | +++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp | ||
26 | @@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) | ||
27 | , m_historyForward(0) | ||
28 | , m_stop(0) | ||
29 | , m_reload(0) | ||
30 | -#ifndef QT_NO_PRINTER | ||
31 | , m_currentPrinter(nullptr) | ||
32 | -#endif | ||
33 | { | ||
34 | setToolButtonStyle(Qt::ToolButtonFollowStyle); | ||
35 | setAttribute(Qt::WA_DeleteOnClose, true); | ||
36 | @@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu() | ||
37 | #if defined(QWEBENGINEPAGE_PRINT) | ||
38 | fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview())); | ||
39 | #endif | ||
40 | -#ifndef QT_NO_PRINTER | ||
41 | fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print); | ||
42 | -#endif | ||
43 | fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF())); | ||
44 | fileMenu->addSeparator(); | ||
45 | |||
46 | @@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen() | ||
47 | |||
48 | void BrowserMainWindow::slotFilePrintPreview() | ||
49 | { | ||
50 | -#ifndef QT_NO_PRINTPREVIEWDIALOG | ||
51 | if (!currentTab()) | ||
52 | return; | ||
53 | QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this); | ||
54 | connect(dialog, SIGNAL(paintRequested(QPrinter*)), | ||
55 | currentTab(), SLOT(print(QPrinter*))); | ||
56 | dialog->exec(); | ||
57 | -#endif | ||
58 | } | ||
59 | |||
60 | void BrowserMainWindow::slotFilePrint() | ||
61 | { | ||
62 | -#ifndef QT_NO_PRINTER | ||
63 | if (!currentTab()) | ||
64 | return; | ||
65 | printRequested(currentTab()->page()); | ||
66 | -#endif | ||
67 | } | ||
68 | |||
69 | void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result) | ||
70 | @@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF() | ||
71 | currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout()); | ||
72 | } | ||
73 | |||
74 | -#ifndef QT_NO_PRINTER | ||
75 | void BrowserMainWindow::slotHandlePagePrinted(bool result) | ||
76 | { | ||
77 | Q_UNUSED(result); | ||
78 | @@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result) | ||
79 | |||
80 | void BrowserMainWindow::printRequested(QWebEnginePage *page) | ||
81 | { | ||
82 | -#ifndef QT_NO_PRINTDIALOG | ||
83 | if (m_currentPrinter) | ||
84 | return; | ||
85 | m_currentPrinter = new QPrinter(); | ||
86 | @@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page) | ||
87 | return; | ||
88 | } | ||
89 | page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted)); | ||
90 | -#endif | ||
91 | } | ||
92 | -#endif | ||
93 | |||
94 | void BrowserMainWindow::slotPrivateBrowsing() | ||
95 | { | ||
96 | diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h | ||
97 | index 91e1c1d2..5bbbb292 100644 | ||
98 | --- a/examples/webenginewidgets/demobrowser/browsermainwindow.h | ||
99 | +++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h | ||
100 | @@ -56,9 +56,7 @@ | ||
101 | #include <QtCore/QUrl> | ||
102 | |||
103 | QT_BEGIN_NAMESPACE | ||
104 | -#ifndef QT_NO_PRINTER | ||
105 | class QPrinter; | ||
106 | -#endif | ||
107 | class QWebEnginePage; | ||
108 | QT_END_NAMESPACE | ||
109 | |||
110 | @@ -142,10 +140,8 @@ private slots: | ||
111 | void slotSwapFocus(); | ||
112 | void slotHandlePdfPrinted(const QByteArray&); | ||
113 | |||
114 | -#ifndef QT_NO_PRINTER | ||
115 | void slotHandlePagePrinted(bool result); | ||
116 | void printRequested(QWebEnginePage *page); | ||
117 | -#endif | ||
118 | void geometryChangeRequested(const QRect &geometry); | ||
119 | void updateToolbarActionText(bool visible); | ||
120 | void updateBookmarksToolbarActionText(bool visible); | ||
121 | @@ -180,9 +176,7 @@ private: | ||
122 | QAction *m_restoreLastSession; | ||
123 | QAction *m_addBookmark; | ||
124 | |||
125 | -#ifndef QT_NO_PRINTER | ||
126 | QPrinter *m_currentPrinter; | ||
127 | -#endif | ||
128 | |||
129 | QIcon m_reloadIcon; | ||
130 | QIcon m_stopIcon; | ||
131 | diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | ||
132 | index 0f3b1765..50a8bb91 100644 | ||
133 | --- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | ||
134 | +++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | ||
135 | @@ -52,10 +52,8 @@ | ||
136 | #include "ui_printtopdfdialog.h" | ||
137 | |||
138 | #include <QtCore/QDir> | ||
139 | -#ifndef QT_NO_PRINTER | ||
140 | #include <QtPrintSupport/QPageSetupDialog> | ||
141 | #include <QtPrintSupport/QPrinter> | ||
142 | -#endif // QT_NO_PRINTER | ||
143 | #include <QtWidgets/QFileDialog> | ||
144 | |||
145 | PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : | ||
146 | @@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : | ||
147 | ui->setupUi(this); | ||
148 | setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); | ||
149 | connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked); | ||
150 | -#ifndef QT_NO_PRINTER | ||
151 | connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked); | ||
152 | -#else | ||
153 | ui->choosePageLayoutButton->hide(); | ||
154 | -#endif // QT_NO_PRINTER | ||
155 | updatePageLayoutLabel(); | ||
156 | setFilePath(filePath); | ||
157 | } | ||
158 | @@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog() | ||
159 | |||
160 | void PrintToPdfDialog::onChoosePageLayoutButtonClicked() | ||
161 | { | ||
162 | -#ifndef QT_NO_PRINTER | ||
163 | QPrinter printer; | ||
164 | printer.setPageLayout(currentPageLayout); | ||
165 | |||
166 | @@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked() | ||
167 | currentPageLayout.setPageSize(printer.pageLayout().pageSize()); | ||
168 | currentPageLayout.setOrientation(printer.pageLayout().orientation()); | ||
169 | updatePageLayoutLabel(); | ||
170 | -#endif // QT_NO_PRINTER | ||
171 | } | ||
172 | |||
173 | void PrintToPdfDialog::onChooseFilePathButtonClicked() | ||
174 | diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp | ||
175 | index 82720ae3..20d3268c 100644 | ||
176 | --- a/src/webenginewidgets/api/qwebenginepage.cpp | ||
177 | +++ b/src/webenginewidgets/api/qwebenginepage.cpp | ||
178 | @@ -80,11 +80,9 @@ | ||
179 | #include <QMenu> | ||
180 | #include <QMessageBox> | ||
181 | #include <QMimeData> | ||
182 | -#if defined(QT_PRINTSUPPORT_LIB) | ||
183 | -#ifndef QT_NO_PRINTER | ||
184 | +#ifdef ENABLE_PRINTING | ||
185 | #include <QPrinter> | ||
186 | -#endif //QT_NO_PRINTER | ||
187 | -#endif //QT_PRINTSUPPORT_LIB | ||
188 | +#endif | ||
189 | #include <QStandardPaths> | ||
190 | #include <QStyle> | ||
191 | #include <QTimer> | ||
192 | @@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res | ||
193 | #endif // if defined(ENABLE_PDF) | ||
194 | } | ||
195 | |||
196 | -#if defined(QT_PRINTSUPPORT_LIB) | ||
197 | -#ifndef QT_NO_PRINTER | ||
198 | /*! | ||
199 | \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback) | ||
200 | Renders the current content of the page into a temporary PDF document, then prints it using \a printer. | ||
201 | @@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re | ||
202 | d->m_callbacks.invokeDirectly(resultCallback, false); | ||
203 | #endif // if defined(ENABLE_PDF) | ||
204 | } | ||
205 | -#endif // if defined(QT_NO_PRINTER) | ||
206 | -#endif // if defined(QT_PRINTSUPPORT_LIB) | ||
207 | |||
208 | /*! | ||
209 | \since 5.7 | ||
210 | diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h | ||
211 | index c7d5a19e..5619639c 100644 | ||
212 | --- a/src/webenginewidgets/api/qwebenginepage.h | ||
213 | +++ b/src/webenginewidgets/api/qwebenginepage.h | ||
214 | @@ -55,11 +55,7 @@ | ||
215 | |||
216 | QT_BEGIN_NAMESPACE | ||
217 | class QMenu; | ||
218 | -#if defined(QT_PRINTSUPPORT_LIB) | ||
219 | -#ifndef QT_NO_PRINTER | ||
220 | class QPrinter; | ||
221 | -#endif // QT_NO_PRINTER | ||
222 | -#endif // QT_PRINTSUPPORT_LIB | ||
223 | |||
224 | class QWebChannel; | ||
225 | class QWebEngineContextMenuData; | ||
226 | @@ -294,15 +290,11 @@ public: | ||
227 | void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF())); | ||
228 | #endif | ||
229 | |||
230 | -#if defined(QT_PRINTSUPPORT_LIB) | ||
231 | -#ifndef QT_NO_PRINTER | ||
232 | #ifdef Q_QDOC | ||
233 | void print(QPrinter *printer, FunctorOrLambda resultCallback); | ||
234 | #else | ||
235 | void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback); | ||
236 | #endif // QDOC | ||
237 | -#endif // QT_NO_PRINTER | ||
238 | -#endif // QT_PRINTSUPPORT_LIB | ||
239 | |||
240 | const QWebEngineContextMenuData &contextMenuData() const; | ||
241 | |||
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 @@ | |||
1 | From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001 | 1 | From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | 3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 |
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | 4 | 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 @@ | |||
1 | From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001 | 1 | From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 |
4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | 4 | 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 @@ | |||
1 | From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001 | 1 | From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | 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 @@ | |||
1 | From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001 | 1 | From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | 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 @@ | |||
1 | From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001 | 1 | From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | 3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 |
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | 4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from |