summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.9.0' in qt/qtwebenginev6.9.06.9.0Qt Submodule Update Bot2025-03-291-4/+4
| | | | | Change-Id: I63d41739cfbfb32f4959da7a7b5a0119baa5eea7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix for null VariationsIdsProvider access crashAnu Aliyas2025-03-271-0/+6
| | | | | | | | | | | https://chromium-review.googlesource.com/c/chromium/src/+/5642198 change requires the valid VariationsIdsProvider. Otherwise leads to crash when adding XClientData header. Change-Id: I6d1b98b5b9f46ab10e162c9be929c7169e343292 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit a4855d90dcc5c685ff8150e3c363bba43c509933) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-261-4/+4
| | | | | Change-Id: I59a12403b58702ac4c38282772faa8ae9dab7396 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-241-4/+4
| | | | | Change-Id: Ib4012d2fe7b8b3346c2fb0710da56fd9817eccd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-181-4/+4
| | | | | Change-Id: I0eccf35e1c5c8e10449bc8b17a134866e56a6bc0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-171-1/+1
| | | | | Change-Id: Ib0a3fba9b144e63c386a6b245e82ec78b6d02d71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-151-4/+4
| | | | | Change-Id: Ibdf05db9b27258427668b4cefcfbf1600130b024 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update ChromiumMichal Klocek2025-03-101-0/+0
| | | | | | | | | | | | | | | Submodule src/3rdparty 689e8302..85693496: * [backport] 0-day [2/2] Disable setting primitive restart for WebGL in the cmd decoder * [backport] 0-day [1/2] Move WebGL primitive restart state setting to the GPU process * [fixup] Qt GN Integration * [fixup][android] Support android build for qtpdf * [fixup] Fix QtWebEngine build on Windows Fixes: QTBUG-134562 Pick-to: 6.9 dev Change-Id: I2848b37d72bbdf8eaabd3b295ab748b50c79289c Reviewed-by: Anu Aliyas <anu.aliyas@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on '6.9.0' in qt/qtwebenginev6.9.0-rc1Qt Submodule Update Bot2025-03-091-4/+4
| | | | | Change-Id: Iaf77c43a11b4b827e2e4d9c3834648526768a6be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.9.0' in qt/qtwebengineQt Submodule Update Bot2025-03-051-4/+4
| | | | | Change-Id: I90102e030e4407b346765c6debba09cc129558e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Amend coin.nodes with new Debian packaging configSimo Fält2025-03-041-0/+1
| | | | | | Pick-to: dev 6.9 Change-Id: I8b392db88c94d2c72a2374e3cd47f3e1a39ebc4f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update ChromiumMichal Klocek2025-03-043-2/+2
| | | | | | | | | | | | | | Submodule src/3rdparty 66a1f2a3..689e8302: * [backport] CVE-2025-0995: Use after free in V8 * [backport] Dependecy for CVE-2025-0995 * [Backport] Security bug 396481096 * [fixup] Fix QtWebEngine build on Windows Fixes: QTBUG-133879 Fixes: QTBUG-134119 Pick-to: 6.9 dev Change-Id: I24c5023313302b2c303c3b9d02e4a8d65961911a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2025-03-033-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty cc3e3122..66a1f2a3: * [fixup] Qt GN Integration * [fixup] Fix jumbo build * [Backport] CVE-2024-11477 / Security bug 383772517 * [Backport] CVE-2025-1426: Heap buffer overflow in GPU * [Backport] CVE-2025-1006: Use after free in Network * [Backport] CVE-2025-0999: Heap buffer overflow in V8 * [fixup][win-arm64] Add configuration files for ffmpeg to support MSVC on ARM * [fixup][win-arm64] Add configuration files for ffmpeg to support MSVC on ARM * [Backport] CVE-2025-0998: Out of bounds memory access in V8 * [Backport] CVE-2025-0996: Inappropriate implementation in Browser UI * [Backport] Security bug 379259821 (5/5) * [Backport] Security bug 379259821 (4/5) * [Backport] Security bug 379259821 (3/5) * [Backport] Security bug 379259821 (2/5) * [Backport] Security bug 379259821 (1/5) * [Backport] Security bug 379418979 * Fix compilation issue with ASAN enabled * [fixup][ffmpeg] Fix building with system ffmpeg * [Backport] Security bug 378917565 (2/2) * [Backport] Security bug 378917565 (1/2) * [Backport] Security bug 378014601 * [Backport] Security bug 359992017 * [Backport] Security bug 379776579 (2/2) * [Backport] Security bug 379776579 (1/2) * [Backport] Security bug 390465670 * [Backport] CVE-2025-0445: Use after free in V8 Fixes: QTBUG-133878 Fixes: QTBUG-133880 Change-Id: I74d0a25e6749fa050e56e12bf7fa9c28031c007f Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
* Fix deadlock on WebEngineContext destructionPeter Varga2025-03-011-0/+7
| | | | | | | | | | | | | | | | | | | viz::Display is destructed with the UI compositor (RenderWidgetHostViewQt::m_uiCompositor). The destruction should be finished on the Browser thread when cleanupVizProcess() gets called in WebEngineContext. However, some of the viz::Display members' destructors (e.g. viz::SkiaOutputSurfaceImpl and viz::DisplayCompositorMemoryAndTaskController) started destroy tasks on the GPU thread. These tasks have to be completed before we try to shutdown threads (BrowserMainLoop::ShutdownThreadsAndCleanUp()) otherwise stopping the VizCompositor thread will cause a deadlock. As a workaround, post a new task on the GPU thread and wait for it to be completed. Change-Id: Ie217720008dae8a7b84adb603479b755dd79f5f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 27216f1d15056e36d90c7cffb2ed3773371a6b2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add clang-cl toolchainMichal Klocek2025-03-013-3/+87
| | | | | | | | | | | | | | | | Fix clang-cl compilation, this is just brings back clang-cl support, however this is just a temporary toolchian which assumes clang-cl.exe in PATH variable. It uses same environment files as msvc22 toolchain. Note all tolchains are going to be in-source in follow up patches. Change-Id: I7ce592266aa008460d7a1ca66042faa517b45d56 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit a765d8f8603087388fca15c0d6bca408c4810181) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix deadlock fixAllan Sandfeld Jensen2025-03-013-46/+11
| | | | | | | | | | | Avoid frozen rendering using a read/write lock which doesnt block the two threads each only needing a read lock. Fixes: QTBUG-134209 Change-Id: I0e73f8ba1b4236c4b280d9b6c28b7fed0c45aaa7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 31151b113ff5a9706a426e6484c534b55202402a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.9' in qt/qtwebengineQt Submodule Update Bot2025-02-281-4/+4
| | | | | Change-Id: Id87078dd5b079ebdb75dd0270ebf9097aa7992d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix -opengl es2 buildPeter Varga2025-02-262-7/+7
| | | | | | | | | | | | | | Guard new GLXHelper usage after a3604e0a4 Disable dma-buf and GBM for nvidia with GLX As a drive-by, add more QT_CONFIG(xcb_glx_plugin) guard where OzoneUtilQt::usingGLX() is called to check if Qt GLX integration is available. Change-Id: I45df5e235f7f98910eedd77e2480d41561105807 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit a47656a53b445a61076719aa0924fb7a8fbc71c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make MotionEventQt assert more informativePeter Varga2025-02-261-4/+26
| | | | | | | | Pick-to: 6.8 Change-Id: I1a91b8fa3004d70f2467085f198d8eaa0ecfdc10 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 254d7db17d09b6c567a3c22567ba322ff952c358) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix possible deadlock in vulkan rendering backendAllan Sandfeld Jensen2025-02-263-3/+35
| | | | | | | Change-Id: Iaac937820a64f2f40f52ff762f3a7145d5b46bb5 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 24084d6424f86713f2e6e505428c8562a57d0578) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Use new qtbase APIs for SBOMMoss Heim2025-02-251-21/+16
| | | | | | | | | | Some recent additions so we don't need to call into internal/private functions, and this also lets us simplify some variables. Change-Id: I30a23b589db7984eca503d606b2716d59be3b7d6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4b269a358f9be701d0850f6ab87584e36054314f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix importing memory object for rendering without NativePixmapPeter Varga2025-02-253-14/+26
| | | | | | | | | | | | | | | | This fixes rendering with newer Nvidia drivers on Linux. - Make memory object dedicated to match Vulkan allocation - Set tiling of the GL texture to match VkImage tiling - Make the TexStorage command non-DSA to uniform GL calls Amends 8ce04357b4ce39b8c4c2243991eae70f78f9b61b Pick-to: 6.8 Change-Id: I43e953412acf6d39b67dcd8af02aac4003fc5c8e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Moss Heim <moss.heim@qt.io> (cherry picked from commit 558bbf10544c9c96cde4ef3c7923c8b3bb8aa237)
* Fix building with opengl es2 configMartin Negyokru2025-02-252-3/+5
| | | | | | | | Qt's gles2 config does not support GLX. Change-Id: I533ce110892c6efa1bd8ab9a02ac55803a5c7159 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b17afb77ee3429785d57ee070df53d2dd9100f9e)
* Detect and use Widevine libraries shipped with Microsoft EdgeKaloyan Chehlarski2025-02-251-9/+41
| | | | | | | | | | | | | | | Add detection for Widevine libraries that come by default with a Windows installation. The libraries may be found both in Microsoft Edge's installation folder, and also inside the WebView2 data folders inside the System32 folder. Also modifies the getters for system folders on Windows, as their docs state that "SHGetSpecialFolderPath is not supported". Change-Id: I98ebf1f6f801f0ea32be6fd3653c9837f2827592 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 69d24b3386c1337fb1a59889477d156f88b26ab7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Widevine path detection on Windows On ARMKaloyan Chehlarski2025-02-251-18/+27
| | | | | | | | | The paths were hardcoded to x32/x64 only. Change-Id: I5ee72dfcf4af3a15fab188afa941fd0a184f0706 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5019d240041cf29b9c47cfedd94e89d2da1b1b87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable dma-buf and GBM for nvidia with GLXPeter Varga2025-02-253-1/+11
| | | | | | | | | | | | | | | It is already disabled with EGL. Checking the existence of a GBM device is just not enough. It is possible to create GBM device and buffer with nvidia driver but it will not work. Pick-to: 6.8 Change-Id: I3806594371d3e266d499bdc396c8f2a4ca17580d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Moss Heim <moss.heim@qt.io> (cherry picked from commit a3604e0a41b586d1f32865d9c60003ed31e46884) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add WebEngineContext::isGbmSupported()Peter Varga2025-02-253-17/+52
| | | | | | | | | | | | | | | Factor GBM support detection out to avoid repetitive Nvidia checks. Also add QTWEBENGINE_FORCE_USE_GBM environment variable to be able to force disable/enable GBM and dma-buf code paths for debugging purposes. Setting the variable to 0 force disables GBM, setting any other integer value force enables it. Pick-to: 6.8 Change-Id: I39fc0161467a6a8d86dd9f380be3bfb2018aa4e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 284d269eda53575d681c5d9f91bc934cf19b2f07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QWebEngineDownloadRequest::pause()Szabolcs David2025-02-258-21/+69
| | | | | | | | | | | | | | | | Calling pause() (or any method which causes state update) in a directly connected signal handler of a download request causes an assertion fail in DownloadItemImpl::UpdateObservers() because it is protected from nested updates. Use QTimer::singleShot() to detach download requests and updates from the direct code path. Add auto test to check if pausing and resuming a download work. Pick-to: 6.8 Change-Id: Ia8c977a626fd0d39ca51df42984381a75cca2101 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 1ffe3392eae1e70f76d621c8a4ee1b20feb004f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix whitespaces in webenginecontext logPeter Varga2025-02-251-1/+2
| | | | | | | | | | | Amends 900ae370f5d6c06a29b08fd94523d30bdc089b88 Pick-to: 6.8 Change-Id: Ib451458eb101fc9f96101620df8bc46e06f4ffad Reviewed-by: Moss Heim <moss.heim@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b6cb444fbd206a27ab2d590158f7693e7247f3ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix spdx files not included in MinGW/LLVM contentTeemu Jokitulppo2025-02-251-0/+1
| | | | | | | | | | | | | Missing entries in qt-installer-package-config.json file caused some spdx files be excluded from Qt PDF installations. Fixed this by adding those entries. Task-number: QTBUG-133970 Pick-to: 6.8 Change-Id: I9a8d857a05c2b93fbe6ff2fd70f2cd8c3644e53b Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit ca222db0ac6780e1867adc598a919bdfe2777722) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make module ready for source SBOM checkingLucie Gérard2025-02-243-7/+57
| | | | | | | | | | | | | | | | | | | This includes: - turning VERIFY_SOURCE_SBOM ON - adding rules to the licenseRule.json files - correcting the licensing given via REUSE.toml files A lot of files are skipped during the license test, but all are present in the source SBOM. This is why corrections are needed before turning the source SBOM check on. Task-number: QTBUG-131434 Pick-to: 6.8 Change-Id: Iabe0bee0ed0fc9de42ee69508eb0dd7d84601647 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 815ea62cc2f4a20b8c19e6d62146e07c0876ab19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace QStringLiteral with shorter u""_s notationPeter Varga2025-02-219-35/+50
| | | | | | | | Pick-to: 6.8 Change-Id: I6d45505c808a48a1ea52ddbd39e74ada4c29136d Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit dbb7830eb9ed95ab9c2f105b850586a9a517cf16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QL1SV where QString conversion is not neededPeter Varga2025-02-214-10/+9
| | | | | | | | Pick-to: 6.8 Change-Id: I1e819d5f570eb52d703691b6e7bd0de29adc9318 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 676eea8bbe4c3c943058561e4ceb02800fd6d76e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add offline-documentation config to coin sanity checkv6.9.0-beta3Michal Klocek2025-02-211-0/+1
| | | | | | | | | 'offline-documention' coin platform id was not handled, add it to coin.nodes Fixes: QTBUG-133977 Change-Id: I4b40463fc5dda47613e63c15d94f907377fba868 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove more unnecessary QString conversionsPeter Varga2025-02-212-5/+7
| | | | | | | | | Pick-to: 6.8 Change-Id: Ifb8e87cb5e49d71d7d8a61f99305d86a986aa032 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 100682f8954ba1de309976cd54c86982f5130ae7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Optimize removing quality values from Accept-Language stringPeter Varga2025-02-212-5/+13
| | | | | | | | | | | | Also add auto test for QWebEngineProfile::setHttpAcceptLanguage() to validate if argument with quality values is parsed properly. Pick-to: 6.8 Change-Id: Ide3acfe93bfe2d4c6afd76bd7239f471942ea467 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 9164704c9a3b89c33f0c1cade84c4a11740c1833) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QSL where the string is converted to QStringPeter Varga2025-02-212-2/+2
| | | | | | | | Pick-to: 6.8 Change-Id: I14bf140ba6dbfdedf1b010070ca8d92078fee8ea Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit c93e694728cf0661009851d4c3e547dd609924eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Concatenate strings with QStringBuilder instead of QString::arg()Peter Varga2025-02-212-4/+4
| | | | | | | | Pick-to: 6.8 Change-Id: I07423cdaf68e7a7333e270f25983584655467e85 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit df367e1ffa8c166016dff2f1ec5b547033a9b5ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QStringList::append() where the string can be moved into the listPeter Varga2025-02-216-39/+45
| | | | | | | | | | | | | As a drive-by, refactor web_engine_library_info.cpp's fromEnv occurrences to use them in the if blocks only and make the code a little bit more readable. Pick-to: 6.8 Change-Id: Ib3ee6390003bc6e196398979d992e71b7fc50a8a Reviewed-by: Moss Heim <moss.heim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 26c43ef73cf6a5184ded71d173224e1cd733c90f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make QString and QByteArray strings constants if not modifiedPeter Varga2025-02-2117-36/+38
| | | | | | | | Pick-to: 6.8 Change-Id: If6c704cf5dada72d2c5c069fcbbcfea16af845ac Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 2ccca2f0663e866b94fd1d7f0195ebff280583fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.9' in qt/qtwebengineQt Submodule Update Bot2025-02-201-4/+4
| | | | | Change-Id: Ic7ea9c1b8d0e6418149e8aa584f9540c049dc786 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port away from foreachPeter Varga2025-02-193-25/+19
| | | | | | | | | | | | | All containers are non-const local variables, and the loop bodies clearly do not modify the container, so can use ranged for loops with std::as_const() to avoid the detach (attempt). Pick-to: 6.8 Fixes: QTBUG-115805 Change-Id: Ie3eec615112a32c44ef81e4c2e5879997e5dc619 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 0ff112a78af56ba03042872b4bb3066754f367f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix flaky tst_QWebEngineView::deferredDeletePeter Varga2025-02-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | A replacement widget for the obsolete QDesktopWidget might be created while hovering a widget in an earlier test during destruction. The extra widget is destructed together with QApplication so it is listed by QApplication::allWidgets() in the subsequent tests. For reproducing this issue run ./tst_qwebengine doNotSendMouseKeyboardEventsWhenDisabled deferredDelete and keep the mouse cursor above the window while running tst_QWebEngineView::doNotSendMouseKeybooardEventsWhenDisabled(). As a workaround take the extra widget into account when testing the size of QApplication::allWidgets(). Pick-to: 6.8 Change-Id: I84cfb75fcee944e8a22b7c12a725f131e96b3719 Reviewed-by: Moss Heim <moss.heim@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5436b61f42e616d0d591e5b55d1e2a586dd4e5f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix download behavior when network error occursSzabolcs David2025-02-191-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | We assume that DownloadManagerDelegateQt::DetermineDownloadTarget() is always the starting point of a download request, but there are special cases when a download item needs more than one target determination (for example when the server is being killed during a large download, Content API tries to check the target again before reporting the error). Handle this case by not decreasing m_currentId and preventing the manager class adding itself as an observer of the same item multiple times. Due to the weird internal state of DownloadItem (INTERRUPTED_TARGET_PENDING_INTERNAL) it still counts as an in progress download and its functions (e.g. Resume()) are inactive. Don't expose this state to our users, just re-use the already provided target path again and they will be informed about the issue in the next OnDownloadUpdated(). Pick-to: 6.8 Task-number: QTBUG-132479 Task-number: QTBUG-132473 Change-Id: Id8d39881b9225d76456edec150035e4331e752c7 Reviewed-by: Anu Aliyas <anu.aliyas@qt.io> (cherry picked from commit 56fbb0fa569287ab00538fbefd6abefe05c3141d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Temporarily work around sbom json generation errorAlexandru Croitor2025-02-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | If the sbom python interpreter or some of the python spdx 3rd party packages are not found, skip generating the QtWebEngine SBOM instead of failing with an error like: CMake Error at qtbase/cmake/QtPublicSbomOpsHelpers.cmake:276 (message): Python interpreter not found for generating tag/value file from JSON. Call Stack (most recent call first): qtbase/cmake/QtSbomHelpers.cmake:56 (_qt_internal_sbom_generate_tag_value_spdx_document) cmake/QtWebEngineSbomHelpers.cmake:101 (qt_internal_sbom_generate_tag_value_spdx_document) src/CMakeLists.txt:45 (qt_webengine_sbom_project_end) Amends c6b93f4f638ada62c5e9257964387d303efd7be6 Change-Id: I9280ae54d26cdec20dacc57736e3d55e6e85e988 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 3250fc3cca8b88d6c8ab2f9edc7dd46bfb2d3681) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add WebEngineDriver source directory to documentation buildTopi Reinio2025-02-191-0/+1
| | | | | | | | | | | | | | | While there is no documentation sources to parse there, the Chromium code attribution script uses it as the output directory for the generated 3rd party licenses. Add the directory to make QDoc parse the generated output. Fixes: QTBUG-133495 Pick-to: 6.8 6.5 Change-Id: I06643163e1b7791664afcfead90a91b65d3039af Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Moss Heim <moss.heim@qt.io> (cherry picked from commit d34d887f271df107ff0ec668cf85de149feeae6d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Warn when PdfDocument.source can't be opened; add note to docsShawn Rutledge2025-02-191-1/+10
| | | | | | | | | | | | | | | | | | When PdfDocument is instantiated in some QML file that comes from application resources, it can be surprising when giving a plain file path to the source property that it tries to resolve it as a resource URL instead of a filesystem URL. But this behavior is consistent with how we handle URLs in other components, such as Image; and Image also generates a QML warning if the file cannot be found. Followup to 3159ac9ff7edf0eea93fa8331ea6cb8abc201ca2 Pick-to: 6.8 Fixes: QTBUG-131841 Change-Id: I8fb66b321406e14c88ff1eb253d46742c0c99b5a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 8c07478a3b1d5eac8db3df0144e824fd0263f9ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix source file path reported in "js" logging categoryPeter Varga2025-02-1410-2/+197
| | | | | | | | | | | Also add auto tests for validating javaScriptConsoleMessage() arguments. Pick-to: 6.8 Change-Id: Ife6a2db66898a15071b6f8d082195794f2f45e27 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ef4e9a07bda2e676a02435080355be30dc0abf09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix flaky tst_QWebEnginePage::discardAbortsPendingLoadAndPreservesCommittedLoadPeter Varga2025-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | The test fail was reproducible on arm64 macOS but it could happen on any platform if it is fast enough. The about:blank page load is interrupted by Discarded lifecycle state in the test. Loading about:blank can be so fast that the navigation is committed before we could send the QWebEnginePage::loadStarted signal. Interrupting the load at this point won't restore the previous commit and breaks the test. As a fix, load a page from the disk which load time is potentially longer than the about:blank page's load time. Pick-to: 6.8 Change-Id: Id885f8a67b5566c5ad9024e40ce36153ff03f832 Reviewed-by: Anu Aliyas <anu.aliyas@qt.io> (cherry picked from commit 0730ae7dd64aeef7a23a3a108b95c5057292c56f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not assign the first part of string in case of concatenationsPeter Varga2025-02-142-3/+4
| | | | | | | | | | This may avoid unnecessary QString allocations. Pick-to: 6.8 Change-Id: I9b1c2d3ce06c6798f6b777660f897c02deb8fbfd Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 12f8f37e1a81fd9dcb5c2925e5a9b5e0df500ad1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 07:55:20 +0000