summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-09-121-4/+2
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ib1202bcce587f9614013105c6a836344c1727cb7
| * Reject certificate error for non-overridable errorsKirill Burtsev2019-08-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On certificate validation error page load is just halted meaning that no progress or load result are reported and no default error page for certificate errors is shown. Even though documentation states that 'By default, an invalid certificate will be automatically rejected' and that aligns with default implementation of certificateError method within Page and non-deferred errors in quick View, page or view silently stays in an intermediate state for non-overridable errors. Fix this inconsistent behavior by automatically rejecting certificate for every invalid case (non-overridable error, not deferred or not implemented overridable method). Change-Id: Id1cee2ee5cc45bdcb5f262a6c99c84274e6ca374 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Fix reporting overridable flag for QML WebEngineCertificateError typeKirill Burtsev2019-08-291-1/+1
| | | | | | | | | | | | | | | | | | Also remove confusion inside CertificateErrorController constructor and overridable method by matching documentation for AllowCertificateError method of ContentBrowserClient api. Change-Id: I7e10ef71a4429dcf5acc4b714a8a45f67a2ec684 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix QWebEnginePage visibility stateJüri Valdmann2019-08-202-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling view.show(); view.load(...); view.hide(); results in a WebContents in visible state because the first call to show() is delayed via a timer and never canceled so it takes effect after the hide(). Also, the page's visibility state is not updated when changing views, so that a visible QWebEngineView can be set to display a hidden QWebEnginePage. Fixes: QTBUG-77209 Change-Id: I0243c659f4039a35c36e04ea55c5972666170fd0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-115-11/+19
|\| | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
| * Fix tooltip text wrappingTamas Zakor2019-07-251-1/+1
| | | | | | | | | | | | | | | | Also set the hiding delay to a reasonable time. Fixes: QTBUG-76122 Change-Id: Id971edbd9fb87cc96df53f73f2e7c61bde5855ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Edit docs on script injectionLeena Miettinen2019-07-225-10/+18
| | | | | | | | | | | | Task-number: QTBUG-76489 Change-Id: If489ebed802d273b0015bc6cfc190d948c4896e3 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix compilation with C++20Marc Mutz2019-07-241-1/+1
| | | | | | | | | | | | | | | | Implicit capture of this in [=] is deprecated. Fix by using explicit captures. Change-Id: Ia4344c4a15669f5076ad848626278a57cbe6767a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-07-101-9/+3
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/quick/qmltests/BLACKLIST tests/auto/quick/qquickwebengineview/BLACKLIST Change-Id: I29b68dec8692d0369a2dda56350ee62d3ad73e08
| * Fully setup replaced QMouseDblClickEvent with source and flagsKirill Burtsev2019-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Not fully preserving properties causes event to not be considered synthesized by system and be forwarded into chromium. Receiving one single press event and no release event confuses input event_handler and triggers infinite loop and renderer process crash for pages with multiple nested iframes. Fixes: QTBUG-62106 Change-Id: Iabb8bff78fc3475923b4aa3209b720453a5b6ce5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Do not forward key-events on QQuickItem levelAllan Sandfeld Jensen2019-06-141-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | We forward the real events earlier, anything coming in at QQuickItem level is synthetic. Fixes: QTBUG-76268 Change-Id: I067f8f94cc5e07bb0cd500b5ae9b9d6bbe66310b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Accept handled eventsAllan Sandfeld Jensen2019-06-141-0/+2
| | | | | | | | | | | | | | | | | | If we let tablet events pass through without handling it, it will come back to haunt us as a mouse event. Fixes: QTBUG-76347 Change-Id: I93297f543620350db0329fe993d18a04e33c7d18 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-06-114-5/+35
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/configure.json src/core/profile_io_data_qt.cpp tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Ie8ae4aa03881a0733ff497fff46e3f7040735650
| * Doc: Improve documentation for QWebEngineView::setHtml()Leena Miettinen2019-06-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | ...and QWebEngineView::setContent()and WebEngineView.loadHtml() The baseUrl cannot be empty. Fixes: QTBUG-75760 Change-Id: If276767ed6a7a9421292299e0ac79d02bbbca0e3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Disable edit actions when content has no focused framePeter Varga2019-05-273-3/+28
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-75505 Change-Id: Ia1329ff554a86e307aa7995e9af1665ea6c5e64c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Workaround for CSS orientation issuesSzabolcs David2019-06-041-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web content can define its orientation for printing using the @page rule in CSS. This creates some edge cases, for example when the pages are not uniform and some of them has different orientation than the others. The current version of desktop Chromium can't handle this perfectly: sometimes it renders portrait pages to landscape papers by cutting down the extra parts. This patch makes our result similar to Chromium's - by ignoring the user's orientation settings in QPrinter. Task-number: QTBUG-75092 Change-Id: Ifaea69c94b6ee1b6a83609cb15207a58554975f9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-05-242-0/+16
|\| | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/net/network_delegate_qt.cpp tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
| * Add path validation for QWebEngineDownloadItem::setPath()Tamas Zakor2019-05-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | Do not set path if it ends with separator or if it matches with an already existing directory name. Task-number: QTBUG-75566 Change-Id: I4b78b28afe034c7589633c569a4945a36b32008e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update docs and test for runJavaScriptJüri Valdmann2019-05-091-0/+5
| | | | | | | | | | | | | | Fixes: QTBUG-69567 Change-Id: Icdf5a200f7be1eb7a98cce62848e3a641c49e804 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into ↵Allan Sandfeld Jensen2019-05-133-19/+44
|\ \ | | | | | | | | | refs/staging/5.13
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-05-103-19/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/profile_adapter.cpp src/core/profile_adapter.h src/webengine/api/qquickwebengineprofile.cpp src/webenginewidgets/api/qwebengineprofile.cpp tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp Change-Id: Ic561f22b361e32a0a63668c73bf6c0fc9c1ce16f
| | * Q(Quick)WebEngineProfile: Update list of internal schemesJüri Valdmann2019-05-071-30/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow installing handler for "about" and everything in kStandardURLSchemes of url/url_util.cc. Except for "gopher" which is used in tests. Suppress warning about custom schemes for "gopher" since it's not a custom scheme. Also lowercase the scheme in urlSchemeHandler() and removeUrlSchemeHandler(). Change-Id: I72b06d4fa6433882019405a0d600a593c8971bf1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Do not crash on QWebEnginePagePrivate::releaseProfile()Allan Sandfeld Jensen2019-05-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Deregistering the widget or deleting the view should be able to handle a now missing d_ptr in the old page. Change-Id: Ic843f7bde12776b6aad4fad865ccf14a25695154 Fixes: QTBUG-75547 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Doc: Add notes about delegating navigation requestsLeena Miettinen2019-05-022-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | ...by overloading QWebEnginePage::acceptNavigationRequest() Task-number: QTBUG-75185 Change-Id: Ieaf9cacd5dd9259159767edba319191cf93f19ad Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Handle corner case of assigning an implicit page to a new viewAllan Sandfeld Jensen2019-04-301-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | Pass the ownership on to the the new view, so it is still handled like an implicit page. Change-Id: I76ad3cb349a492e60e3ad2bdd4aebaabed07bd4f Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | Introduce RenderWidgetHostViewQtDelegateQuick::windowGeometry()Allan Sandfeld Jensen2019-05-072-0/+8
|/ / | | | | | | | | | | | | Leave it up to hostview delegate to report window geometry. Change-Id: I19a4b911aa493fbc6f66c6169e7fbbb7bf674217 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Make warning about wrong shutdown a warningAllan Sandfeld Jensen2019-05-031-1/+1
| | | | | | | | | | Change-Id: I414064984d51bf5a000c1cfd8cca7ccd6bf4b09b Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Doc: Fix QDoc warningsLeena Miettinen2019-05-031-2/+2
| | | | | | | | | | Change-Id: I00ec352cdea43d44388889805f1bd609a3555c4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-04-303-0/+10
|\| | | | | | | Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
| * Fix QWebEngineView::setPage not deleting old pageJüri Valdmann2019-04-173-0/+10
| | | | | | | | | | | | | | | | | | | | | | Also fix QWebEnginePage::setView not deleting old page Also fix wrong page being deleted if it's parented to the view. Fixes: QTBUG-75131 Fixes: QTBUG-75175 Change-Id: Ie4dfb15b3182de7aa3a94cddcac54ea40a86121b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Add \since tag for QWebEngineProfile::setDownloadPathv5.13.0-beta3Kai Koehne2019-04-131-0/+2
| | | | | | | | | | Change-Id: I3638fd51bbb871b7dc920a7c3e1435c26db02f7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge branch '5.12' into 5.13Allan Sandfeld Jensen2019-04-097-45/+45
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/renderer/user_resource_controller.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-overview.qdoc Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
| * Doc: Avoid auto-linking the string 'WebEngine' to the QML typeLeena Miettinen2019-04-017-45/+45
| | | | | | | | | | | | | | | | | | | | Remove the previous workaround (internal \externalpage command) that was used for this purpose, and replace it with a \QWE macro that expands to the string 'Qt \WebEngine'. The backslash in the expanded string instructs QDoc not to attempt auto-linking the word. Change-Id: If4e1c95423fa07479b1af055e4760a890c0ac667 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Notification API cleanupKirill Burtsev2019-04-055-26/+37
| | | | | | | | | | | | Task-number: QTBUG-74543 Change-Id: Ice5a0dbfc3485c8b7e6fa900ef427a9aed871d42 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTRAllan Sandfeld Jensen2019-04-032-3/+3
| | | | | | | | | | Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-282-6/+9
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/web_contents_view_qt.h src/core/web_engine_context.cpp Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
| * Fix escaped characters in tooltipAllan Sandfeld Jensen2019-03-261-3/+5
| | | | | | | | | | | | | | | | | | Go back to making the tooltip richtext, but set a white-space:pre to keep the tooltip mostly unwrapped. Fixes: QTBUG-74659 Change-Id: I5e30ee0098a608eda969b090355915a75f55405f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fixup focus implementationAllan Sandfeld Jensen2019-03-212-3/+4
| | | | | | | | | | | | | | | | | | Follow the other implementation and pass TakeFocus to WebContents Delegate, and hook to our UI from there. Also fixes use of Blur instead of LostFocus, which means we now render unfocused more correctly. Change-Id: I34a1882489bc68b9ff36ed5139af0ee8a3a95b79 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix capitalisation of letters for PDF viewer settingMichael Brüning2019-03-193-4/+4
| | | | | | | | | | | | | | | | PDFViewerEnabled is renamed to PdfViewerEnabled. Task-number: QTBUG-74543 Change-Id: I48a242a52ab0689b06815ac3cbd98c44902cc358 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Notification API cleanup: direction type, parameter and method namesKirill Burtsev2019-03-191-3/+7
| | | | | | | | | | Change-Id: I0349f3eea0028a4df917af8599c073227e0d0ec1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix -no-ssl buildv5.13.0-beta1Peter Varga2019-03-071-0/+4
| | | | | | | | | | Change-Id: I978f70545484060218f5243c74978c85bc603c16 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-0410-45/+100
|\| | | | | | | Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479
| * Force destruction of webcontent client before profile adapterMichal Klocek2019-03-014-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently users might forget to delete webcontent client before profile adapter. This might be nasty if users are not aware of default profile. Instead of asserting badly in chromium, clean up and release chromium resources. This avoids the crash, but might leak memory if users never deletes page. Task-number: QTBUG-74021 Change-Id: I66f466f169d12f7ee08866d505260dca47800bb0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Always treat \brief as full sentenceKai Koehne2019-02-225-21/+21
| | | | | | | | | | | | | | | | | | Make sure all \brief descriptions start with an upper-case letter and end with a . Also start descriptions of \class with the name of the class or struct. Change-Id: Ifd2656201f9c1dff092085508a5423ce516e2d3f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Clarify documentation of QWebEnginePage::title()Jüri Valdmann2019-02-222-2/+8
| | | | | | | | | | | | | | | | | | | | Explain what happens when the HTML has no proper <title> defined and clarify the meaning of 'by default': it refers to the state before load()/setUrl()/etc. Fixes: QTBUG-71799 Change-Id: Ib2669007573b3ea53e205d9228237bae392f6f78 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Remove download properly on profile destruction to avoid use after freeKirill Burtsev2019-02-193-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | In the Widgets API, download items are children of the profile and are destroyed when the parent profile destroys its children. The download item's destructor can therefore not access the profile, as it would cause a heap-use-after-free crashes. On quick side turn ongoing downloads cleanup to match widgets one. Fixes: QTBUG-73839 Change-Id: Iabb379e91187e3e68ebcd4693fec35883b72b1f2 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Set download state to finished when cancelling or destroying the download itemKirill Burtsev2019-02-192-6/+17
| | | | | | | | | | | | | | Task-number: QTBUG-73839 Change-Id: Ieebaa802bdfe0c410618e4213a9bedbbae9d0f61 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Tie client certificate stores to profilesAllan Sandfeld Jensen2019-03-012-0/+14
| | | | | | | | | | | | | | | | Move the client certificate store from being global to being tied to individual profiles. Change-Id: Ib21ae14c501b7d0612b84ae7535120291aeeada2 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | API cleanupAllan Sandfeld Jensen2019-02-272-18/+9
| | | | | | | | | | | | | | Based on review feedback Change-Id: Ide40d4fd563ea682eaa2cc457d857445adea85cd Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix crash on unsetting request interceptorAllan Sandfeld Jensen2019-02-261-2/+4
| | | | | | | | | | | | | | | | | | Don't access nullpointer. Also don't print developer warnings to end-users. Change-Id: I273101dd581a335464ff2dbae5095bc99e455649 Reviewed-by: Michal Klocek <michal.klocek@qt.io>