summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update ChromiumMichael Brüning2024-02-142-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty e257d651..707f4e7c: * [Backport] CVE-2024-1284: Use after free in Mojo * [Backport] CVE-2024-1283: Heap buffer overflow in Skia * [Backport] CVE-2024-1059: Use after free in WebRTC * Fixup: [Backport] Security bug 1407197 * [Backport] Use raw strings for regexps in Python code. * [Backport] CVE-2024-1077: Use after free in Network * [Backport] CVE-2024-1060: Use after free in Canvas * [Backport] Security bug 1519980 * FIXUP: Fix build with VS Toolset 17.8 * Fix build with VS Toolset 17.8 * Remove unused python import * [Backport] Update vendored copy of six to 1.16.0. Fixes: QTBUG-121845 Fixes: QTBUG-122095 Change-Id: Ice00b6537b19d2a7af7787b5f2989283c89130b7 (cherry picked from commit 8b521bfccd0ed6fe084bc0bf5b41ec04c31dc83b) (cherry picked from commit 278edc41fbacd169b5ffce7cb7c91fe9a8355fe6) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/6.6' into 6.5Michael Brüning2024-02-0224-121/+218
|\ | | | | | | Change-Id: I149f99b0672be030d5d7c5cf6763cd2d0cf4852c
| * Update ChromiumMichael Brüning2024-02-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 7b40abeb..e257d651: * [Backport] Security bug 1407197 (2/2) * [Backport] Security bug 1407197 (1/2) * [Backport] CVE-2024-0810: Insufficient policy enforcement in DevTools * [Backport] Security bug 1511389 (2/2) * [Backport] Dependency for security bug 1511389 (1/1) * [Backport] Security bug 1511389 (1/2) * [Backport] CVE-2024-0807: Use after free in WebAudio * [Backport] CVE-2024-0808: Integer underflow in WebUI Task-number: QTBUG-121685 Change-Id: Ie8e7a70265b142b65cea5bd89c9afa45fb0dec6c Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 935caecbbff5ac79d2c43d6bdcd81fe7d83baedf)
| * QPdfIOHandler: Ensure QPdfDocument still exists before renderingShawn Rutledge2024-02-022-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PDF-viewing application is unceremoniously exited while QQuickPixmapReader::processJobs() still has PDF rendering jobs queued up, it could be that the shared QPdfDocument instance is deleted just as QPdfIOHandler::read() starts the rendering. Use a QPointer to avoid that. Fixes: QTBUG-121502 Pick-to: 6.5 Change-Id: I5d0674ca77ab5015b710df49b3842064e65d4adc Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit ed49163c8fef019be18475b86694263801c3a8ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 77d2e9ad33a12dbc3e8ddc3ce40498b28029147f)
| * QPdfView: use per-page scale factors to render search result rectanglesShawn Rutledge2024-02-022-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FitToWidth and FitInView zoomModes, each page could potentially be a different size; so QPdfViewPrivate::calculateDocumentLayout() loops over all pages, calculating each pageSize and offset on the fly. m_zoomFactor doesn't get updated; but QPdfViewPrivate::updateDocumentLayout() stores the per-page zoom factors in m_documentLayout.pageGeometryAndScale. screenScaleTransform() takes the page index as an argument, looks up the per-page scale factor in those zoom modes, and QPdfView::paintEvent() uses the per-page transform to paint the rectangles. Pick-to: 6.5 Task-number: QTBUG-120764 Change-Id: I86308c8963ffadd2fdb6f36cf9f4696f75f550ed Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 2b96bbb922c1500b8d3b12cf2eb3052ded41c5c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 427c1e114ab2969bfb51b24d0401f7e0286b5873)
| * Delay PdfMultiPageView.goTo[Page|Location] if called too earlyShawn Rutledge2024-01-281-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PdfMultiPageView does not expose a property alias to TableView.rows; we could call it pageCount, but we don't want to mislead users into thinking that the view is the "source of truth" for how many pages it's going to show. The document's pageCount is populated earlier, and that's a problem only in such a case when it's too early to ask the view to go to a particular page. So we work around it in the view by treating these goTo functions as requests to be satisfied as soon as it becomes possible. Fixes: QTBUG-119416 Pick-to: 6.5 Change-Id: Ie2377fe6f2983b72e871b1be2afe4d0878f60841 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit e9a5b6e514996c059d52a857a5aef624afb80a0e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d63c4dacd2b4ffa2608965ed7e49303b75c722ad) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Fix discontinuity with successive pinch-zoom in PdfMultiPageViewShawn Rutledge2024-01-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pinch.persistentScale is settable since 6.5 (qtdeclarative a432970b258edb9ff041d221b2155df30cad4799): we need that to tell PinchHandler to start over from 1 after we have also set the rendered scale back to 1, because PinchHandler does not read the scale property for itself. This cherry-pick includes 48ebac59b1ec5bbafa1c64adbdbc44b0cf3f302a to avoid a crash on exit by waiting for the rendering to be done, and a4e64baef027fb407b8c1491c444ed58edd15529 to disable touch compression. Fixes: QTBUG-115502 Task-number: QTBUG-120245 Task-number: QTBUG-121502 Fixes: QTBUG-121564 Pick-to: 6.5 Change-Id: I21951c447bf33e5942b6a1635488d5474ec8f293 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c0524da14d92a957b4607fb5867dba5d23eea6d9) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 8c27ae33f80440d20f578fa404c454c8d7bfdf19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Correct PrintedPageSizeId to match QPageSize::PageSizeIdMichael Brüning2024-01-243-9/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | With Qt 6, QPageSize::PageSizeId enum was cleaned up and some values were reordered, but the WebEngineQuick part was not changed accordingly. Pick-to: 6.5 Fixes: QTBUG-120218 Change-Id: I7e4c419750d30a64193e68b0b217ebbccce07d87 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 199730bd41219c5484fb1c4c61b637ab9ceec0c4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8f017c2d9d015b9d72a7f1f36e53747bad6c3bfa)
| * Fix high-dpi scaling in PdfScrollablePageViewShawn Rutledge2024-01-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 85f82185ef5102a2dbe3b2e437b9723e1652ce57 In PdfScrollablePageView.qml, a property like property size pagePointSize: document.pagePointSize(pageNavigator.currentPage) would get evaluated too early (QPdfDocument::pagePointSize() returns a default-constructed QSize if d->doc is still null). We need to call pagePointSize() directly in bindings that need it, so that the function will be called again each time some other binding dependency changes, to get the size of the current page in the current document. Perhaps a binding to the result of a function call does not get invalidated when the function argument changes; or perhaps behavior changed now that the QML files tend to be compiled rather than runtime-interpreted resources. We also need PdfPageImage's width and height to be bound (as they are in PdfMultiPageView.qml), to avoid automatically scaling up to sourceSize. So now we get high-dpi page images again in the single-page example. Task-number: QTBUG-86948 Pick-to: 6.5 Change-Id: I44e8df15c18bd0b752dccc899028e7e7900f6ffb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 3093ddfa8fb22db9295bc76a07207e6da0a3e995) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit bb514314f924e7f94ac48f4d2283a254cff4cd83)
| * Fix cursor position during compositionAnu Aliyas2024-01-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During input composition, the cursor is set to the starting position of the string being edited and refrain from updating it throughout the composition process. Once the string is committed, it is set to the last position of the committed string. The modified code is designed to exhibit the same behavior as the widget and quickwidget. Fixes: QTBUG-118746 Pick-to: 6.5 Change-Id: I9adb7a9bea9493457a1d9d4b32338cdba30920a1 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit c9550388b9ab1d82454d0c59eaaf7e640d83d750) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 266c9a5605e05166c0b6e9113e19595856149bd2)
| * Fix printing when page ranges are specifiedSzabolcs David2024-01-211-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Page ranges are applied at the PDF generation phase and it's incorrect to do it again in PrinterWorker. Simplify it to print all available pages. Fixes: QTBUG-119991 Change-Id: Iaaf435ba2a93ea4480dc1d2f5500844138ea1b53 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ad26c851700de5ee0962a944d6fc02b58004de1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2463c13ae64701e7c18495eb7dd63e0dc7a129b3)
| * Fix compilation error with -no-feature-accessibility optionAnu Aliyas2024-01-213-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - At present, there is no option to disable accessibility in Chromium during build time. - Added the missing definition for BrowserAccessibility::Create() to resolve the compilation issue. - This approach is similar to the BrowserAccessibilityManager::Create() function. Fixes: QTBUG-119789 Pick-to: 6.5 Change-Id: I87a0a3653fa18aa3d32d5620a18f89e9403c92ab Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 39e437f0bc990cf292defff0d77790d27b31df32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6fc5eff5cef36ae86704a5f2e05b58c1f5e82a62)
| * Update ChromiumMichael Brüning2024-01-192-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 38bef0c..7b40abeb: * [Backport] Security bug 1506535 * [Backport] CVE-2024-0518: Type Confusion in V8 * [Backport] CVE-2024-0519: Out of bounds memory access in V8 * Fix compilation without webrtc * Speculative fix for jumbo builds on windows Fixes: QTBUG-121229 Change-Id: I106c80206bc84c592d2fe1df770c391883d587df Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix required version for core and core in host projectMichal Klocek2024-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | During compile or cross compilation against core qt (or core qt in host) with lower version. As we 'support' compiling against latest LTS so currently 6.5 Change-Id: I62596e73fcd7265a85edf4048f82e1a060615e7f Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 8eba10d3b7db7e456f736417f90f84d460ead4f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a1b0579555d91f34f452c4b94fe77f71e9448b7b)
| * Speculative fix for missing licenses for qtpdf on doc.qt.ioMichal Klocek2024-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When executing 'ninja docs' documentation is generated locally with code attributions for qtwebengine and qtpdf, however it is missing on doc.qt.io in case of qtpdf. Make 'ninja prepare_docs' target to already generate pdf_attributions, hopefully it fixes the issue as it is unknown how those docs are generated in the end, moreover this is the only difference between qtwebengine and qpdf doc target setup. This amends 98c84d8d7a4ef4a308b1a75f90ff075135995c60 Fixes: QTBUG-120663 Change-Id: Id1b371209ead987460fabb53c3bc35070dbedb35 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit bd33e00c54bdfc5ff3c25eefe7a13638d189369e) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Update ChromiumMichael Brüning2024-01-172-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 028cbdb7..38bef0cb: * FIXUP: FIXUP Do not include xproto when no x11 * [Backport] Security bug 1511689 * Fixup: [Backport] Security bug 1488199 * [Backport] CVE-2024-0222: Use after free in ANGLE * [Backport] CVE-2024-0223: Heap buffer overflow in ANGLE (3/3) * [Backport] CVE-2024-0223: Heap buffer overflow in ANGLE (2/3) * [Backport] CVE-2024-0223: Heap buffer overflow in ANGLE (1/3) * [Backport] CVE-2024-0224: Use after free in WebAudio * [Backport] CVE-2024-0225: Use after free in WebGPU * [Backport] CVE-2024-0333: Insufficient data validation in Extensions * [Backport] CVE-2023-7024: Heap buffer overflow in WebRTC * FIXUP: Fix compilation with system ICU * [Backport] Replace imp.load_source with importlib equivalent. * Do not include xproto when no x11 * [Backport] Security bug 1488199 (3/3) * [Backport] Security bug 1488199 (2/3) * [Backport] Security bug 1488199 (1/3) * Bump V8_PATCH_LEVEL * [Backport] Security bug 1505632 * [Backport] Security bug 1506726 * [Backport] CVE-2023-6706: Use after free in FedCM * [Backport] CVE-2023-6705: Use after free in WebRTC * [Backport] CVE-2023-6703: Use after free in Blink * [Backport] CVE-2023-6702: Type Confusion in V8 * FIXUP: Add missing pkg_config calls for system libs * Add missing pkg_config calls for system libs * [Backport] Security bug 1485266 * [Backport] CVE-2023-6510: Use after free in Media Capture Fixes: QTBUG-119857 Fixes: QTBUG-121003 Fixes: QTBUG-121004 Fixes: QTBUG-121005 Fixes: QTBUG-121006 Change-Id: Ic71d208d6f4cd285a60092936fb6a4ffc4620e6f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Fix text formatting in JS DialogsMartin Negyokru2024-01-125-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use plain text instead of escaped html to match other browsers behavior. Also set the text format for qml dialogs. Fixes: QTBUG-119245 Task-number: QTBUG-83338 Change-Id: Icb2c9fd21f27487418835372d6afda96a6812cc3 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3fcf62c0c19e89abbd154bc5f1fc8d84099aa58e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b9c8cfba0154a260ec618df53c3d8e030a544662)
| * Fix printing from PDF pluginSzabolcs David2024-01-128-58/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the plugin finder logic everywhere to match with Chrome. This comes with a small cleanup: collect PDF-related helper functions scattered around WebEngine in one pdf_util_qt implementation. Add auto test to catch this recurring issue earlier. Task-number: QTBUG-119878 Change-Id: I03b2bd62bebf5b38afc572e0629db106d024e89d Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit e09cf6e7a1f582d06f86ff2c166b7c2269fd4b47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a1ffdacd23c13d97793b87f098e3ec7ab8ff1de6) Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Remove DOH debug messageSzabolcs David2024-01-121-7/+0
| | | | | | | | | | | | | | | | Change-Id: I79ef6363772c484989dadda76ce18fb285a6ea64 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 738fa8b626b1155cae101d3de7f6e6fd7331c1f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 59e9b1a5812d4e95742257237a369c714d388493)
| * Fix mac build with x86_64hMichal Klocek2024-01-123-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not not really support x86_64h on mac with gn, so in case of "-DCMAKE_OSX_ARCHITECTURES=x86_64h" do x86_64 build anyway. Make arch test most strict as we did not really control the outcome. Add some architectures names as they were missing. Fix leaking cpu setting. Clean up toolchain setup which differs based on target os (win,linux,mac,ios,android). Note for some platforms we generate toolchain, for some we used gn provided ones. Fixes: QTBUG-118120 Change-Id: Ia6fa8a59f55c1ebf37c10e469172520505214d38 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 3e4bc31ade660878a5040cc39e66687476524774) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 79febc044da9663d9cf03fdd1b9012e47df65f14)
| * Clean up and fix typos in cmake filesPeter Varga2024-01-123-4/+4
| | | | | | | | | | | | | | | | Change-Id: I68e46ec382c4c63c106c545cf6815777954a6afc Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit e6e82804a009394fdccee4e5f37195c9383f2d5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9fd9cec7056116688eb924ab8c06f26573dbd232)
* | QPdfIOHandler: Ensure QPdfDocument still exists before renderingShawn Rutledge2024-02-022-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PDF-viewing application is unceremoniously exited while QQuickPixmapReader::processJobs() still has PDF rendering jobs queued up, it could be that the shared QPdfDocument instance is deleted just as QPdfIOHandler::read() starts the rendering. Use a QPointer to avoid that. Fixes: QTBUG-121502 Change-Id: I5d0674ca77ab5015b710df49b3842064e65d4adc Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit ed49163c8fef019be18475b86694263801c3a8ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 77d2e9ad33a12dbc3e8ddc3ce40498b28029147f) (cherry picked from commit fb8b5abb4cf6859323e4eef9e3c00b301d8ce7d0)
* | QPdfView: use per-page scale factors to render search result rectanglesShawn Rutledge2024-02-022-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FitToWidth and FitInView zoomModes, each page could potentially be a different size; so QPdfViewPrivate::calculateDocumentLayout() loops over all pages, calculating each pageSize and offset on the fly. m_zoomFactor doesn't get updated; but QPdfViewPrivate::updateDocumentLayout() stores the per-page zoom factors in m_documentLayout.pageGeometryAndScale. screenScaleTransform() takes the page index as an argument, looks up the per-page scale factor in those zoom modes, and QPdfView::paintEvent() uses the per-page transform to paint the rectangles. Task-number: QTBUG-120764 Change-Id: I86308c8963ffadd2fdb6f36cf9f4696f75f550ed Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 2b96bbb922c1500b8d3b12cf2eb3052ded41c5c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 427c1e114ab2969bfb51b24d0401f7e0286b5873) (cherry picked from commit 57774a5eba87bc1ba181effefe9dc614f2d3330c)
* | Merge "Merge remote-tracking branch 'origin/6.6' into 6.5"Michael Brüning2024-02-01190-1510/+3472
|\ \
| * | Merge remote-tracking branch 'origin/6.6' into 6.5Michael Brüning2024-02-01191-1511/+3485
| |\| | | | | | | | | | | | | | | | [ChangeLog] WebEngine now uses the version from Qt 6.6 for the 6.5 branch. Change-Id: I882e8f806d4158a84e7a23ec294452cbbdc2720a
| | * QQuickPdfPageImage::load(): fall back to base class impl to avoid crashShawn Rutledge2024-01-071-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plain Image is ok for loading one PDF page at a time, except that the pdf plugin has to create its own PDF document object if it cannot reuse an instance that is already open. So PdfPageImage was created just as an optimization, with the expectation that the document will be given to the document property. But in case someone doesn't understand and tries to set only the inherited Image.source property instead, fall back to QQuickImageBase::load() to avoid crashing. Amends 7b8832ca2b84d549c9d374550c3c46b3d4d42a38 If both the document and source properties are set, prefer the document (for the sake of performance). Add test coverage of other combinations of properties, while we're at it. Pick-to: 6.5 Fixes: QTBUG-104767 Task-number: QTBUG-77506 Change-Id: I1ee0d0bb2a6c5f399234ddddd969be02e7a6c020 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit b60c00f4adec9ea4b75af0226b04a7125e166ae2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2180ce8901ac1caddf5b7b5cd73ba67d2d08349a)
| | * Add default styled icons to actionsAnu Aliyas2024-01-074-29/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a default icon to action using the newly introduced QWebEngineViewPrivate::webActionIcon() Fixes: QTBUG-119722 Change-Id: I4ee9b4380ead80d991756147bfef40f0f17c0849 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a25d6fb7da7287dfe6c9d86e917013ea262a9ac1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5c0c7c7e966e56c0489780fa45679ac909dfa668)
| | * Fix wrong dictionary file layoutMichal Klocek2024-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MACOSX_BUNDLE can be always set despite of the platform, so check if we are on mac (or ios for completeness) Change-Id: I808afbad4b1dac565049eca084bef187e93e6fd0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 290a93bcf4ebb3ae6582e3cae8cb4b2f4bd7c38b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 85de311ce282ee513d28874f14ae00a4b77f33ef)
| | * Fix for crash in tst_multipageviewAnu Aliyas2024-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-104766 Fixes: QTBUG-120245 Change-Id: If79f4bef1d6b42e2df3537482613d977c86d90dd Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 54c61c7912c163ad1153dfca360565fdf107e666) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Fix crash in QQuickPdfSearchModel::setCurrentPage()Shawn Rutledge2023-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found while testing the single-page example with a fix for QTBUG-119776: m_quickDocument is null until we open a document. Pick-to: 6.5 6.2 Task-number: QTBUG-119776 Change-Id: I548d549d4fc63d1a40b141f728c0c58d3db1178d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit a21be3a9fe6747e6d4da762a4350ff024f94547c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ede8d4b6e4ea6ce1f4352346b672e54c3b695a5b)
| | * Harden QPdfSearchModel::resultAtIndex() against OOB indexShawn Rutledge2023-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-119776 Pick-to: 6.5 6.2 Change-Id: Id7addc15c15b78451d7f8b989335d12976426a30 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 0dbc2de4a7dc20627a7382776d6b896fdd094e61) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7ce8149bf136f27802a3a3ba9d9adf4f2e0cba76)
| | * CMake: Fix deployment of QtWebEngine projects on LinuxJoerg Bornemann2023-12-223-0/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a deployment hook for the generic deployment tool, which deploys - QtWebEngineProcess to QT_DEPLOY_PREFIX/libexec - resources to QT_DEPLOY_DATA_DIR/resources - locales to QT_DEPLOY_TRANSLATIONS_DIR/qtwebengine_locales Since we're picking this to lower branches, we cannot expect that QT_DEPLOY_LIBEXEC_DIR is set. Therefore, we initialize it if it doesn't exist. Pick-to: 6.5 Task-number: QTBUG-119077 Change-Id: I39fde919044d011376d8beb7e892dc9b5205c028 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 73d58b489e8f4f900042f0ab6c1104e6431752e1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 371514b97fa5c4d6f607892469cd3ae9a486ecd7)
| | * Forward unhandled mouse wheel events to the parent widgetAnu Aliyas2023-12-213-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All mouse wheel events are forwarded to Chromium. - Forward unhandled wheel events by Chromium to the parent widget. - Impersonated QSpontaneKeyEvent in Qt WebEngine to set spontaneous flag and forwarded the event as spontaneous. Fixes: QTBUG-118398 Pick-to: 6.5 Change-Id: I4ec831b0077edc3d833fdd7ae8d31a5535b0c05b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 5654e6c45c4c0aee8d2d6f4e344b4c8c9dd3d74e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ebaed0fa4c336eaa328b6bf011c5d028fa2a20e3)
| | * Update ChromiumMichal Klocek2023-12-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 148f3965..028cbdb7: * [Backport] Ensure CheckedContiguousIterator satisfies C++20 Concept * [Backport] Disable usage of `__is_cpp17_contiguous_iterator` until libc++ rolls. * [Backport] Make CheckedContiguousIterator work correctly for libstdc++. * Fix building with system libxml2 Change-Id: I14493fcd0605cf989bafbdd52b26c546edd4e73a Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * [Doc] Bump required version of Node.js to v14Sze Howe Koh2023-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium 112 requires Node.js 14 or newer Amends 96abe0c83c7399cf771eb5155998c706a2243f0e Change-Id: I61941d2aa127f7bccd0fa337ff18d772d5909af3 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a4567b28c9e921a0369338185f70a298e9cdfffd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 46cfa3ddc1ec7c3e9a1b8aa4bc3575eace4b3a8f)
| | * [Doc] Port QWebEnginePage::findText() snippet to Qt 6Sze Howe Koh2023-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pick-to: 6.5 Change-Id: I70452ca18264e1914606ba043af913b3c032f4bb Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a527c6aa2f6480302bbbf99586b0aa94f654e4b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d3540f37afd4252f961131a2623ba7f8b313a664)
| | * Update ChromiumMichael Brüning2023-12-082-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 772cb04f..148f3965: * [Backport] CVE-2023-6346: Use after free in WebAudio * [Backport] CVE-2023-6347: Use after free in Mojo * [Backport] CVE-2023-6345: Integer overflow in Skia (2/2) * [Backport] CVE-2023-6345: Integer overflow in Skia (1/2) * [Backport] Check nullity of web preferences * Use pkg-config on mac if found * Fix compilation with mingw 13.1 Fixes: QTBUG-119568 Change-Id: Ib8369cd948bb541c81f7dfff0b37aec695cea4f9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Fix unconditional pointer access in QWebEngineDownloadRequest::pageMichael Brüning2023-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The adapterClient pointer in QWebEngineDownloadRequestPrivate can be initialized to a nullptr in some scenarios, but was used without checking if the pointer is actually set. Pick-to: 6.5 Task-number: QTBUG-119763 Change-Id: I7a8653e7f0f5d920dbe69785fb3ce3518c96cc24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3c6056d062c3b94ff9031cb4931a59de06137d1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Update ChromiumMichael Brüning2023-12-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 772cb04f..6c805bf7: * [Backport] CVE-2023-6112: Use after free in Navigation * [Backport] CVE-2023-5997: Use after free in Garbage Collection Fixes: QTBUG-119158 Change-Id: I59ceb253adbe0ea03ee2c4757d510f1e8bd50a8d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Doc: Remove \ingroup all-examples command from the docsJaishree Vyas2023-12-063-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-115044 Pick-to: 6.5 Change-Id: I83314f3b7955e1ef9c857bcc96c07f6f90b2f875 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 70e019c76088102df7cb0446e239c2be31de2865) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Rename QtWebEngineProcess exe in debug modeAnu Aliyas2023-12-062-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Windeployqt is searching for QtWebEngineProcessd.exe in debug mode. As per current implementation CMAKE_DEBUG_POSTFIX is append to QtWebEngineProcess name only when the configuration is debug and release, leading to errors when deploying application using windeployqt. - Appended CMAKE_DEBUG_POSTFIX to QtWebEngineProcess in dbeug mode. Change-Id: I43c25eb7a29e2442475f025b2daf360fd7aaffae Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 39b97d903a0cacea0faf468c91e222c7f09a3e71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Fix use of system zlib for qtpdfSamuli Piippo2023-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | third_party zlib got pulled into build and we need also use_system_zlib flag set accordingly. Pick-to: 6.5 Task-number: QTBUG-116595 Change-Id: Iee4c91ec240512e23fe7ab612658320b0537920c Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 84d85b67507cdd380ec854b63ee0d72c16025c3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * [DevTools]:Add --remote-allow-origin to chromium launch flagAnu Aliyas2023-12-053-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is required due to the recent changes in chromium https://chromium-review.googlesource.com/c/chromium/src/+/4106102 - As per this change , it will reject all debugging web socket connections with a defined Origin header, unless the browser is started with a new flag `--remote-allow-origins=<origin>[,<origin>, ...]`. The star origin `*` which allows all origins. Fixes: QTBUG-118995 Change-Id: I53169cd401988155bac5797b4c56e7456a2c742a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5558ce40bf40c7982fa04755680b9d39a5e4d7c3) Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * doc: Add the QPdfBookmarkModel::document propertyShawn Rutledge2023-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-119536 Pick-to: 6.5 Change-Id: I31028e19c2d376133f0fcd6c06ecc295163f1747 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit a96693c65e376aea3417aaec1d7a54c09a9a3995) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Support pkg-config on macMichal Klocek2023-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user can compile qt with pkg-config support on mac, in this case and only in this case we should also use pkg-config in qtwebengine. Use pkg-config feature from core. Add missing ldir flags to linker. Fixes: QTBUG-115357 Change-Id: I401949a50c8199a7d400455db5fbbb4e0de652b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7cb5bf9a3da8f445cd18d84d2ee0f90958feb2c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Fix compilation arm64Michal Klocek2023-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing header include. Do not compile global setting tests as it tests so far only doh and requires ssl. Fixes: QTBUG-119525 Change-Id: I011cd3b0ed6e9d5e55e1fc80a102cc7a388681f1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Update ChromiumMichael Brüning2023-11-182-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 4253d879..772cb04f: * Add android on windows build support * [Backport] CVE-2023-5996: Use after free in WebAudio * Do not require android support libs for 32bits Fixes: QTBUG-118891 Change-Id: Ic93d91df7365de9c8bc1b3c5b667c2537e9da6b1 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 71b4ebbf035d7a08184a43b896c4d51e1391421a) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit c7d0da165e45aea19ef0f8331b18ebbeaa85b00c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Provide the correct type information for WebEngineViewAnu Aliyas2023-11-113-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Duplicate entries in the QML type file are created when exporting the type as a value and its enums within a namespace. Resolved this by introducing a derived class, and using it for exporting the Enums. - Added namespace resolution to avoid type ambiguity Fixes: QTBUG-117031 Change-Id: Ieea4492238843c3c781c8d9602ddc89207b61137 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit e96b6d58801f541f5e67330cf2dc6f9aa52522a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Add NOTIFY in QWebEnginePage property url definitionAnu Aliyas2023-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing NOTIFY in QWebEnginePage property url. Fixes: QTBUG-117658 Pick-to: 6.5 Change-Id: I58c8161e41f02ab78c829fd9ef588506a55f6fd3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 95c13aa9b551dd4ebd31710f42ced27e5078115e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * NativeSkiaOutputDevice: handle errors on creating a shared textureAllan Sandfeld Jensen2023-11-111-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid asserting or crashing on nullptr access after failure,. Task-number: QTBUG-116445 Pick-to: 6.5 Change-Id: I75a99c97acfe07b4328be075b0f75df5f2357dbe Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 2ec0171d43e5377d9fe264d5f5c97e85a42e1191) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>