summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
Commit message (Collapse)AuthorAgeFilesLines
* Return printToPdf to QWebEnginePageAllan Sandfeld Jensen2021-08-102-55/+10
| | | | | | | | | | It doesn't use QPrinter and can be done using QtGui classes only. Change-Id: I0e14563c1bb5e93d9803bb1a807f702b1a2a5315 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit b405ed26336a44ad4f359cdb4e1909e31c113cd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QWebEnginePage::view() replacementAllan Sandfeld Jensen2021-08-092-0/+16
| | | | | | | | | | Make it a static getter in QWebEngineView Fixes: QTBUG-95331 Change-Id: I552f0047343abd909c5cd521a7a7a01d62896b00 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3fd9d08bc24bc5f769677b411750d73801adc2d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Various clean-ups around QWebEngineViewPeter Varga2021-07-204-39/+40
| | | | | | | Change-Id: I16f27054871f63526946101e07cb0dcf4aa3b390 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit e4bb4b8bc443fa78c0cd4509cc8ec1251e8296ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update parameters to findText callbackAllan Sandfeld Jensen2021-07-143-5/+4
| | | | | | | | Change-Id: I622ff55c1c9b6f9d4818228c75543c3deffa37be Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 56b1f53d9b2927f5ba2a73f85cee59e385bf489d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with printing disabledAllan Sandfeld Jensen2021-07-131-0/+1
| | | | | | | Change-Id: I11d3f61d1c916e6696a1cbf85bb0e0457fe52188 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 96d87ed9fdc1d24febbeabe5d6baceef4c856899) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Clean up includes, forward declarations and friends in core apiPeter Varga2021-07-081-0/+1
| | | | | | | Change-Id: I58e2dc2443bca75b0d315694c9f6503251a7be02 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 8c30f95f2a9b5de6d638f68bd3ab2bdaac7e1995) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation issues for Qt WebEngineTopi Reinio2021-07-072-5/+7
| | | | | | | | | | | API and documentation changes since 5.15 caused multiple warnings from QDoc; this change addresses most of them. Some warnings indicate missing documentation, those issues still remain. Change-Id: I96be38b7daac37a7e35c149b4b3ec3f18c4415c9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit c248844b3b8ee004800606d1a6c6e6d6bee31738) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix docs since 6.0 references for new apisKirill Burtsev2021-07-021-1/+1
| | | | | | | Change-Id: I2d9cf4fffda1ad614388844781ac4fece15dde0d Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 57eb73f933e3c1499a969b2023073c3c01bb9a1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch printToPdf to std::functionAllan Sandfeld Jensen2021-06-243-10/+13
| | | | | | | Change-Id: I2660e60665542681bc9b0a479ce7fd9d93b896ae Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 233d61a0cb0b66ce2f3d548046acd90cdfa39cc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix module specified for moved classesAllan Sandfeld Jensen2021-06-242-896/+0
| | | | | | | Change-Id: Iad93680dd0811086c481d9bf8adb298f663bdfa4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 0bcd8a6b8f96b214892fb296c6d6655ade43136f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix some translated messagesFriedemann Kleint2021-06-241-1/+1
| | | | | | | | | Give messages a context and use placeholders for arguments. Change-Id: Ib07f74f6c9f0024c2851b3e4f2093f980115244d Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit dcaa369bc1659a28b8de4c9d619c72c485e72274) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QPageRanges to PDF printingAllan Sandfeld Jensen2021-06-222-8/+16
| | | | | | | | 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>
* Switch QWebEngineCallbacks in QWebEnginePage to std::functionAllan Sandfeld Jensen2021-06-184-15/+19
| | | | | | | Change-Id: I5b0c1c7ef0966c3cff79184aa0733b59208d6890 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 566a4df270911e1656efef5dbb16e4f95bf6ca8d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add back the rest of the lost printing documentationAllan Sandfeld Jensen2021-06-111-2/+44
| | | | | | | Change-Id: I35a4857d873559403d0574a69c59b4fd1e9a952f Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit f7cde55256c0a0d7d1d87569bfc47aa35b8b7c64) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move printing finished callback to signalAllan Sandfeld Jensen2021-06-112-10/+47
| | | | | | | | | | | | We can only have one printer active at a time anyway. At the same time restore some lost documentation. Task-number: QTBUG-63235 Change-Id: I454ef3fb038712c832e73c661120fbbe77b3a90c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 4338bcbacf467c0d0d7aec36fbd186ca6b9e02f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace Q_NULLPTR and pointer 0 with nullptrAllan Sandfeld Jensen2021-06-101-1/+1
| | | | | | | Change-Id: Ifd7acf49b22be1532ba98371982af4b14f08e6fc Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> (cherry picked from commit 4a5a1ab7849bba6aed87132296c79ca9dba6d113) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch QWebEnginePage::findText() to std::functionAllan Sandfeld Jensen2021-06-104-4/+4
| | | | | | | | | | Leaving further API modification for later Task-number: QTBUG-63235 Change-Id: I75367ee5d4ce071abaeed361d2dc27c64fb6dd8a Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit f820e8f1993ca2a3e6808467cabca82e464f36e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge WebEngineHistory's quick implementation into QWebEngineHistoryKirill Burtsev2021-06-041-231/+0
| | | | | | | | | | [ChangeLog][QWebEngineCore][QWebEngineHistory] New methods to access navigation history as a model through new class QWebEngineHistoryModel. [ChangeLog][QWebEngineQuick] QQuickWebEngineHistory is merged into QWebEngineHistory. Task-number: QTBUG-74585 Change-Id: I9f9a73bbaf3954282dfc220cfc2c4cb08a37fb73 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Drop printsupport dependency from coreSzabolcs David2021-06-034-1/+145
| | | | | | | | | Prevent linkage of core to widgets by moving printing API from QWebEnginePage to View and using QPagedPaintDevice (the QtGui ancestor of QPrinter) where it's needed. Change-Id: I6ea96edb495b0dcaaa584bbe72632fda025c18d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move createWindow to a signalAllan Sandfeld Jensen2021-06-032-6/+9
| | | | | | | | | | | | | | Ports QQuickWebEngineNewViewRequest to QtWebEngineCore. [ChangeLog][QtWebEngineQuick][WebEngineView] WebEngineView::NewViewRequested is now handled with WebEngineView::acceptAsNewView() instead of with WebEngineNewViewRequest::openIn(). Task-number: QTBUG-74587 Change-Id: I9b27128948076e13f2c228458e1e7491df12153d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add missing FileSelectionMode enum valueBalazs Egedi2021-05-312-1/+2
| | | | | | | FileSelectUploadFolder value is added. Change-Id: Ie69782234bcbf3460d2999ac08ee9f88dea190c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add missing dependecies, update shasMichal Klocek2021-05-251-1/+1
| | | | | | | | | | | Include WebChannel,Positioning cmake packages into WebEngineQuick and WebEngineWidgets. WebEngineCore depends on it so this should be pick up automatically, but in the case of clean build and due to how things work in cmake this is required otherwise linker genex will complain. Change-Id: I54fe8ffdb824e1fd0c0dcdfbbb43b1bcf06411bb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make handling of certificate errors possible from a signalAllan Sandfeld Jensen2021-05-251-1/+1
| | | | | | Task-number: QTBUG-74587 Change-Id: I9955a4c70b339523b5e9e9d6dffe928e61fbab90 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Clean headersMichal Klocek2021-05-221-1/+1
| | | | | | | Fix errors from the 'clean headers' task on coin. Change-Id: I058697e726228800c0fd3220b1d40ac154efb47c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add WebEngineWidgets, WebEngineQuick modules cmake buildMichal Klocek2021-05-194-4/+35
| | | | | | | | | Fix some library dependencies and make proper header includes in core. Task-number: QTBUG-91760 Change-Id: I415361dd42ef2cc39716ce3f5f56e6e8556ac4c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-121-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webenginewidgets/printme/printhandler.cpp src/3rdparty src/core/api/qwebenginepage_p.h src/core/content_browser_client_qt.h src/core/web_contents_adapter_client.h src/core/web_contents_delegate_qt.cpp src/core/web_contents_delegate_qt.h src/webenginequick/api/qquickwebengineview_p_p.h tests/auto/quick/qmltests/data/tst_download.qml tests/auto/quick/qmltests/data/tst_viewSoure.qml tests/auto/widgets/loadsignals/tst_loadsignals.cpp tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be
| * Fix inconsistent number of load signals and their orderKirill Burtsev2021-05-062-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change tries to match how chromium treats one single load. Before the pair of loadStarted/loadFinished methods for api classes was called on delegate's DidStartNavigation/DidFinishNavigation, which might be many within one single logical load. This is true for multiple usecases (like multiple redirects on load, immediate form submit on DOM load, page's subresource load, or just an error page load on failure). Tracking these methods and deciding when to emit signals based on states are error-prone and complicates logic for no benefits. Also it somewhat lies about when real load is done, which is only started and finished on outer methods DidStartLoading/DidStopLoading, which are conveniently called only once for all mentioned usecases. So, this change uses these methods to issue signals for load start/finish, and only makes exception for error page, which is needed for quick's private test support. Fixes: QTBUG-65223 Fixes: QTBUG-76802 Fixes: QTBUG-87089 Fixes: QTBUG-90342 Fixes: QTBUG-91773 Fixes: QTBUG-92063 Change-Id: I9cc99b639030fedd8cf6a9dc04d0869d6be6357d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Doc: Add a note about navigation within a page to a fragmentKirill Burtsev2021-05-061-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-76802 Change-Id: I38cd148706c0479ffbad1e0d2877adc1cad9038d Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Docs: Suggest to use higher DPI for printingSzabolcs David2021-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | When printing with the default resolution of QPrinter, rasterized images of pages are just too small to produce sharp result. Documentation of QPrinter also mentions that the default ScreenResolution should only be used for drafts. Change-Id: I5fe93f7985d16b1126cf2bbcb9b4a4ddbdfd21f2 Task-number: QTBUG-92185 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Replace 0 pointer constants with nullptrAllan Sandfeld Jensen2021-03-223-3/+3
| | | | | | | | | | Change-Id: I938b593deef66c782f5b0998948c0a7b2c32f656 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-03-161-1/+9
|\| | | | | | | Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
| * Only disconnect QWebEnginePage signals that QWebEngineView connectedMichael Brüning2021-03-111-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | When the QWebEnginePage changed on a QWebEngineView, all signal connec- tions between the view and the previous page were removed as well, even those that the user connected themself. To prevent unexpected behavior, only disconnect the signals that the view connected to automatically and leave the rest of the connections intact when the page on the view is changed. Fixes: QTBUG-90509 Change-Id: Icac3e3be0b598dec8107e8fffdf7f25dd88a4b71 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-171-3/+2
|\| | | | | | | Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
| * Remove more leftovers of the old compositorAllan Sandfeld Jensen2021-02-082-14/+0
| | | | | | | | | | | | | | Also removes another private dependency Change-Id: Ie0a671c66f9aa49e7001c44e69bf94e11ab058a5 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| * Fix loadFinished signal if page has content but server sends HTTP errorPeter Varga2021-02-052-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For triggering an error page 3 conditions should be fulfilled: - main frame navigation - the page's document is empty - the HTTP status code indicates an error This fix adds check for the empty document and sends loadFinished signal without expecting an error page if the document is not empty. Fixes: QTBUG-90517 Change-Id: I6463d75fb5e682932feca64b0f059f9aa475795c Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| * Adaptations for Chromium 86Allan Sandfeld Jensen2021-01-131-1/+1
| | | | | | | | | | Change-Id: I7e0ebecdbb68cfff0b574c966f3fa80d28680e1c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 85Allan Sandfeld Jensen2021-01-131-2/+9
| | | | | | | | | | Change-Id: I33c1af7c431055d95e0fb540246765cce684de15 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Suppress error pages also for http errors if they are disabledKirill Burtsev2021-01-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load with client or server http error results in successful navigation, which leads to 'true' loadFinished result, and subsequent chromium's error page load and display with second set of loadStarted/loadFinished signals. This effectively ignores QWebEngineSettings::ErrorPageEnabled. Fixing it requires submodule change to ask embedder if error pages should also be suppressed for http errors. Also update chromium for required change, which pulls in the following changes: * e71010069b4 Fix embedded builds with printing enabled * f5a93d251cc Allow the embedder to suppress an error page for http errors Change-Id: I731678575439a6dad90dfb89e79b0083c63b49c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix new view request handlingTamas Zakor2020-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore url loading if the request is not from a data url and the Q(Quick)WebEngineNewViewRequest.openIn() is not called on newViewRequested(). Set the missing Q(Quick)WebEngineNewViewRequest::requestedUrl property. Fixes: QTBUG-87378 Change-Id: Idddc9cf075db68dcf5825b3e746d16419d02cfa0 Reviewed-by: Tamas Zakor <ztamas@inf.u-szeged.hu> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move QWebEnginePage to coreMichal Klocek2020-11-245-3095/+1
| | | | | | | | | | | | | | | | | | [ChangeLog] QWebEnginePage is in QtWebEngineCore Task-number: QTBUG-74585 Change-Id: Id326c89c868e9e7d53488bbd12cb321e1a0b79b7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Move PrinterWorker to coreMichal Klocek2020-11-244-255/+1
| | | | | | | | | | | | Task-number: QTBUG-74585 Change-Id: I1968d5104d7d0d86d8f33879ed8c06f2a4846509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move QWebEngineHistory to coreMichal Klocek2020-11-246-491/+21
| | | | | | | | | | | | | | | | | | | | | | Keep debug stream operators in page for now, since QWebEngineHsitory is accessible from page only. [ChangeLog] QWebEngineHistory is in QtWebEngineCore Task-number: QTBUG-74585 Change-Id: I5dfc13a0d59ac87f18fe4905ebcfd4a9ec5ad3a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Drop dependency on QApplication in pageMichal Klocek2020-11-241-4/+4
| | | | | | | | | | | | | | Use QGuiApplication instead. Change-Id: I2e1df98e3d12a3a40f0e5b4f026ecc8418aec271 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Drop dependency on QWebEngineView in pageMichal Klocek2020-11-245-47/+197
| | | | | | | | | | | | | | Introduce temporarily PageView interface and DummyDelegate. Change-Id: I3a3d57435c98b31a15fb6d777045e141d007486f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move default notification presenter setter to viewMichal Klocek2020-11-242-3/+5
| | | | | | | | | | | | | | | | | | Default notification presenter depends on qsystemtryicon, so it depends on widgets, move setter when page is set on view. Change-Id: I379b083fe66a4b44e4b92e01a7e5270837fd645c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move styled icons from page to viewMichal Klocek2020-11-233-10/+29
| | | | | | | | | | | | | | | | | | Styles are bound to widgets, add styled action's icon on QWebEngineView::pageAction(). Change-Id: Ica7b1688c34c51e746a3b4707a6181c0d45c882a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Swap widgetCahgned with adapterClientChangedMichal Klocek2020-11-234-9/+9
| | | | | | | | | | | | | | | | This drops dependency on view delegate implementations in web contents adapter client. Change-Id: I73a0dda0a790b7afe3fa774b53db9aa263d48ef9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move page's view and widget bindings to viewMichal Klocek2020-11-207-97/+102
| | | | | | | | | | Change-Id: Ia60a1b864bb173bfd12a94ac4791477a88ea0842 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove qwebengineview setter from qwebenginepageMichal Klocek2020-11-202-21/+6
| | | | | | | | | | Change-Id: Ifaac7287d24e38e04e217cae65f6e5294e8bdd9e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move dialogs from view to pageMichal Klocek2020-11-203-119/+175
| | | | | | | | | | Change-Id: Ib0f0ccca0d94c6c8f19d7d359bbf79110ba04f3e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>