summaryrefslogtreecommitdiff
path: root/src/webengine/api
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'WebEngine' ambiguity for Qt6Michal Klocek2021-04-1335-10115/+0
| | | | | | | | | 'WebEngine' is a qml module, however name itself is ambiguous. Thefore now with Qt6 and with cmake port name the module as WebEngineQuick. Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f 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-162-2/+3
|\ | | | | | | Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
| * Fix mad popup qquickwindows on waylandMichal Klocek2021-02-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On wayland with weston the popup quickwindow should have parent otherwise it gets into 'mad' mode and jumps around the screen. This also fixes similar issue on some embedded x11 setups. Adding parent brakes positioning of popups, but the fix is done in followup patch. This patch also has a regression, closing application during opened comobox will cause crash, however before this patch application simply did not remove render process or "hanged" on exit. This issue is also handled in follow up patches. Change-Id: I876b9a5b58a731eee95f30a52a3c2705730631da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix build with Qt 5.12Allan Sandfeld Jensen2021-02-151-1/+1
| | | | | | | | | | | | | | No QMap::insert as set or append. Change-Id: Icb05e43c4cb3d45171a164bdda7420d066eab79e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Move QQuickWebEngineLoadRequest to core as a base api typeKirill Burtsev2021-03-038-277/+30
| | | | | | | | | | | | | | | | | | | | | | Prepare it to be used in widgets api for load status change. Turn it into simple value type which is allowed to be copied, stored and spied upon. [ChangeLog] Move WebEngineLoadRequest as a basic type into QtWebEngineCore Task-number: QTBUG-74585 Change-Id: Ie182da02a539a89323b8bbec07f1daa700309e70 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-173-5/+11
|\ \ | |/ | | | | Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
| * Fix loadFinished signal if page has content but server sends HTTP errorPeter Varga2021-02-052-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * FIXUP: Doc: Describe the WebEngineView.LoadStoppedStatus enum valuePeter Varga2021-02-031-3/+6
| | | | | | | | | | | | | | | | | | Add description for the WebEngineLoadRequest QML type too. Task-number: QTBUG-57636 Change-Id: I021af3c49e8235b04ce60efa6143b2e547fc65ad Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-252-4/+13
|\ \ | |/ | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Fix blank popups in qmlMichal Klocek2021-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | In qml when on platforms without windowing system we need to send show notification. Note this was not required with old compositor, since it was hooked up differently than viz. Task-number: QTBUG-86034 Change-Id: I3ecdc033802d59c15637bc0e48961cd7748b1c6b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix some warningsPeter Varga2021-01-161-1/+1
| | | | | | | | | | Change-Id: Ic7cff2556945272761288fedd271796dbf240cb5 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| * Adaptations for Chromium 85Allan Sandfeld Jensen2021-01-131-4/+12
| | | | | | | | | | Change-Id: I33c1af7c431055d95e0fb540246765cce684de15 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge branch '5.15' into devAllan Sandfeld Jensen2021-01-191-3/+3
|\ \ | |/ | | | | | | | | Last commits before 87 update. Change-Id: Id156b0199a8fd354c946cfe604ae8541ba554658
| * Fix leak in QQuickWebEngineViewPrivate::contextMenuRequestedAllan Sandfeld Jensen2021-01-121-1/+1
| | | | | | | | | | Change-Id: Idb41daa68709c769330527a713689241ac073359 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Fix compilation with newer devMichal Klocek2020-12-102-4/+4
| | | | | | | | | | Change-Id: I6c24e8907fbe95b1b16c12f5a5ff68ebe5c2bdfd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Swap widgetCahgned with adapterClientChangedMichal Klocek2020-11-232-7/+0
| | | | | | | | | | | | | | | | This drops dependency on view delegate implementations in web contents adapter client. Change-Id: I73a0dda0a790b7afe3fa774b53db9aa263d48ef9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove deprecated url interoceptor setter from profileMichal Klocek2020-11-202-28/+0
| | | | | | | | | | | | Change-Id: I15c621da6da97b2ccdd57afdfad0d413302d3c24 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Drop dependency on page in profileMichal Klocek2020-11-181-2/+2
| | | | | | | | | | Change-Id: Idbec1657522272c895dc1822e83e0d9592c33343 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Small refactor of startDraggingMichal Klocek2020-11-132-19/+8
| | | | | | | | | | | | | | This is required to decouple 'view' logic from page. Change-Id: I84ef8cf729ef87d9339cae3f1bb1f0c709035ccf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Cleanup qwebenginescript and qwebenginescriptcollection apiMichal Klocek2020-09-282-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up script and collection apis: * do not allocate user_script on heap, there is no need for that. * remove isNull(), which was used by collection.findScript(name) * remove collection.size(), there is already collection.count() * remove collection.findScript(name), user can use findScripts(name) which returns list of scripts or empty list if not found * collection.findScripts(name) is simply collection.find(name) [ChangeLog] Removed QWebEngineScriptCollection::findScript(name), use QWebEngineScriptCollection::find(name) instead. Change-Id: Iecf8f1d7c26275b9ce3a1ea97cf4bd74b17f681e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Use qwebenginescriptcollection in qmlMichal Klocek2020-09-256-193/+22
| | | | | | | | | | | | Change-Id: I8bfb805661aa0d2bc2c66dbbb5843b2e551aa64d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Reuse qwebenginescript in qmlMichal Klocek2020-09-249-558/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse core class and adopt api: * add missing setUrlSource to c++ class * fix typing for setRunsOnSubFrames * remove all invokable from setters in qml, we use properties for that anyway. * remove invokable toString , since we have debug stream operator in c++ [ChangeLog] In qml websetttings.runOnSubframes is now websettings.runsOnSubFrames Change-Id: Iba822a7aa6a59940484c972726d710a1b66cb20d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-221-2/+21
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/core/certificate_error_controller.cpp src/core/compositor/display_gl_output_surface_qsg.cpp src/webengine/doc/src/webengine_certificate_error.qdoc tests/auto/quick/qmltests/data/tst_certificateError.qml Change-Id: I976958a0833030bfd7c3ed762585eb12031306b0
| * Fix favicon engine under device pixel scalingAllan Sandfeld Jensen2020-09-221-2/+21
| | | | | | | | | | | | | | | | The QIcon::pixmap function does internal scaling messing up our intermediate structures. Change-Id: I727efd58a4cc948fa3e4b23539d97e8ca755d060 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Avoid to reject a certificate error twice in QuickPeter Varga2020-09-161-0/+6
| | | | | | | | | | | | | | | | Widget API already ignores these cases. This would cause a crash for fatal certificate errors after 83-based. Change-Id: I3e80bb12f023f22e330218a5b20f3e267bb237dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Introduce qml script collection and make webscript as basic typeMichal Klocek2020-09-2213-265/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In widget apis webenginescripts are value types and are managed by webenginescriptcollection. Introduce same concept in qml and make qquickwebenginescript a value type and reuse core userscript as private implementation. Rewrite webenginscript list handling. This patch is half baked since it does not include docs and tests for new api, however aim is to move script classes to core and reuse those in qml land. Therefore, new class introduced here is going to be removed in follow up patches, so all the missing parts will be added later. A new way of managing scripts in qml is as follows: * using collection with javascript dictionaries var script = { name: "FOO" sourceUrl: Qt.resolvedUrl("foo.js"), injectionPoint: WebEngineScript.DocumentReady } webEngineView.userScripts.collection = [ script1, script2 ]; * using collection with webscript basic type var script = WebEngine.script() script.name = "FOO" webEngineView.userScripts.collection = [ script ]; * using fine grain user script collection api with basic type var script = WebEngine.script() script.name = "FOO" webEngineView.userScripts.insert(script) Of course new api can be extended and we can provide more convince overloads. Note the main motivation here is to enable reuse webenginescript object created in c++ land, which is now passed as value in follow up patches. This changes reuses private apis of qml and will most likely require further changes when QTBUG-82443 is completed. [ChangeLog] WebEngineScript is a basic value type in qml, it is no longer declarative way of creating it, instead use WebEngine.script() Change-Id: I6a0ac3607e4522ccaefcec0a7d2986577d7e7024 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move QWebEngineFullScreenRequest to coreKirill Burtsev2020-09-152-47/+4
| | | | | | | | | | | | Task-number: QTBUG-74585 Change-Id: I953f46d01c1e4a82ab0d75b5f955e4f346f1c941 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Reuse qwebenginesettings from core in qmlMichal Klocek2020-09-117-103/+106
| | | | | | | | | | | | | | | | | | | | Drop duplicated enums. Use qwebenginesettings as private for qquickwebenginesettings. This can most likely be more optimized when profile is moved to core. Change-Id: I04bdc6c5a35556bf6d38a273cefeeee9d2a0a310 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Allan Sandfeld Jensen2020-09-077-8/+14
|\ \
| * \ Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-077-8/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/compositor/display_gl_output_surface_qsg.cpp src/core/web_engine_context.cpp tests/auto/quick/quick.pro Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235
| | * Ignore QQuickWebEngineNewViewRequest if it is unhandledTamas Zakor2020-08-253-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the case when the WebEngineNewViewRequest.openIn() is not called on newViewRequested(). For example, when opening the view source from context menu in quick minimal example. Fixes: QTBUG-85494 Change-Id: I7c1ae53684361de459b2f268e471904e632821b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fix suggest-override warningsAllan Sandfeld Jensen2020-08-184-8/+8
| | | | | | | | | | | | | | | | | | | | | Also violates modern Qt code style Change-Id: Ibb12b6db18bbd2669377abe1d25034ed69a86389 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | Add missing const ref to certificateError in qmlMichal Klocek2020-09-021-1/+1
|/ / | | | | | | | | | | | | This was refactored by mistake when changing the c++ api. Change-Id: If04c59ce7f33e59426ef0ea7e9585008449160c6 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Improve QWebEngineCertificateError apiMichal Klocek2020-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove const ref from QWebEngineCertificateError Q_GADGET is a value type, QWebEngineCertificateError is pass as const reference from api. This is not so useful since, in qml this will be anyway copied and for c++ this is not useful since reject, ignore, defer methods are all const. Therefore simply pass it by value. * make consistent naming defer(), acceptCertificate(), rejectCertificate() * remove properties 'differed', 'answered' which are use internally, user knows if he calls functions. * error.errorDescription -> error.description() * error.error() -> error.type() [ChangeLog] In QWebEngineCertificateError use acceptCertificate() instead of ignoreCertificiateError() Change-Id: I9ffa500a0a455d98445b066252dd283872740731 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Rename QWebEngineDownloadItem -> QWebEngineDownloadRequestMichal Klocek2020-08-183-19/+19
| | | | | | | | | | | | | | | | | | | | This fits better with other QWebEngine*Requests. [ChangeLog] QWebEngineDownloadItem is now QWebEngineDownloadRequest, also in qml. Change-Id: I506e9fac746b4f23ac0936c2fbe1c7472f4fda36 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Remove obsolete, deprecated api from qwebenginedownloaditemMichal Klocek2020-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | This patch removes: * path() * type() * DownloadType enum Change-Id: I3e29f9e8ce9e39b015c57cb7005e0290d1496291 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Move QWebEngineDownloadItem to QtWebEngineCoreMichal Klocek2020-08-176-1119/+22
| | | | | | | | | | | | | | | | Use QWebEngineDownloadItem class in qml instead of QQuickWebEngineDonloadItem. Change-Id: I0fc9595f8675c9b082be873adead6de3df1e669d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Cleanup namespace issues in coreMichal Klocek2020-08-144-7/+14
| | | | | | | | | | Change-Id: Ifdffc556278fa5d133da1896600a71248662e9fa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Simplify WebEngineCertificateErrorMichal Klocek2020-08-142-12/+2
| | | | | | | | | | | | | | | | Removes certificateErrorControllerPrivate, moves error handling logic to core. Change-Id: I050f73f1e37eb9ae39ad471fe1673d2b6140cf89 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move QWebEngineCertificateError to core and use it in QMLJüri Valdmann2020-08-145-379/+11
| | | | | | | | | | | | | | | | Update qml certificate error test. Task-number: QTBUG-74585 Change-Id: I9383052bd1e37160d03e3d66e8f2e4a749023736 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix almost all deprecation warningsJüri Valdmann2020-08-132-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace QString::fromUtf16({const ushort * -> const char16_t}) QMap::{unite -> insert} Q{Hover,DragEnter,DragMove,Drop}Event::{posF() -> position()} Q{Hover,DragEnter,DragMove,Drop}Event::{pos() -> position().toPoint()} Q{DragEnter,Drop}Event::{mouseButtons -> buttons} Q{DragEnter,Drop}Event::{keyboardModifiers -> modifiers} QMouseEvent::{localPos -> position} QMouseEvent::{windowPos -> scenePosition} QMouseEvent::{screenPos -> globalPosition} These should all be just renames without any change in behavior (save for some floating point conversions). The one remaining issue concerns the deprecation of binary JSON in qtbase, which is recommended to be replaced with CBOR. Change-Id: I8f3b533242fe9a58c08c2b09ff5d0bdbbfa6dd17 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix api unfilteredLinkUrl -> linkUrlMichal Klocek2020-08-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | Before previous change unfilteredLink(private) was returned as linkUrl(public), however linkUrl(private) was also used, therefore when merging context menu data classes functions were refactored to unfilteredLink and filteredLink to prevent braking the logic, now fix the public api as it was before. Change-Id: I84e0444b32aa344ed0401b58b5a8144a6fb58441 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge all webenginecontextmenudata wrappers into one classMichal Klocek2020-08-125-617/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new class qwebenginecontextmenurequest in core which merges: * qquickwebenginecontextmenurequest * qwebenginecontextmenudata * implictly shared webenginecontextdata Unfortunately new class has to be QObject, since we want to reuse it qml. Q_GADGET can be used only as a value type, however we need to know if request is accepted or not in qml, therefore it must be passed as pointer. Since we use QObject now, class is no longer implicitly shared, however we only allocate request once and reuse the object for every new request (it is still copied in qml just to keep it aligned with other request handlers) [ChangleLog] QWebEngineContextMenuRequest is replacement for QWebEngineContextMenuData Change-Id: Ib387ec2065361a4bacc20675ca7352ab75a0e436 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Use QList instead of QVectorJarek Kobus2020-07-152-3/+3
| | | | | | | | | | | | Task-number: QTBUG-84469 Change-Id: I666a060351f73783e15e3f96884c9393a5cd7e46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Select opengl RHI backend while we still use QQuickWidgetAllan Sandfeld Jensen2020-07-061-5/+7
| | | | | | | | | | | | | | QQuickWidget depends on using the OpenGL backend. Change-Id: I3679e90723930b3fd627a0ce03935dcca0372212 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Move scenegraph handling out of coreJüri Valdmann2020-07-063-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Display{Producer,Consumer,FrameSink} with the new classes Compositor and Compositor::Observer. The Compositor subclasses are implemented by the OutputSurfaces, replacing DisplayProducer in this role. Unlike DisplayProducer, the new classes do not use QtQuick scenegraph types, but rather give access to the software QImage or OpenGL texture directly. The connection to the "other half" is simplified by replacing DisplayConsumer with Compositor::Observer, which is no longer implemented by RenderWidgetHostViewQt, but directly by its delegates in the quick and widgets libraries. RenderWidgetHostViewQt now only provides the delegate with a Compositor::Id which is used to connect the corresponding Compositor and Observer. The delegates are responsible for generating QtQuick scenegraph nodes from the information provided by the Compositor subclasses. Behavior with software and old OpenGL scenegraph backends is unchanged: both continue to work. As for the RHI scenegraph backend, the code here is correct but nonetheless not working: changes are needed in qtbase to make RHI use the global share context for its OpenGL context. Fixes: QTBUG-78682 Change-Id: I837da8860a18ec366ed33f6ecc44c147245e1101 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Add ; to Q_UNUSEDLars Schmertmann2020-06-271-2/+2
| | | | | | | | | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Id948c173695923a1ea83a2098bafc10cfd4dc22b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-05-281-4/+6
|\ \ | |/ | | | | Change-Id: I40d9ae90a4ea82c6242f5d0a1665af3856ad2f0b
| * Delete unused function editorActionForKeyEventJüri Valdmann2020-05-251-2/+0
| | | | | | | | | | | | | | Change-Id: I5fe08380e297cdf8138df0b49b3c82e741f54dd1 Pick-to: 5.15 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3472641433d0adab3caea008f047aac9637828c4)
View Lorry Controller Status