summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'tqtc/lts-6.5.5' in qt/tqtc-qtwebenginev6.5.5-lts-lgpl6.5.5Qt Submodule Update Bot2024-02-221-4/+4
| | | | | Change-Id: Ic9969ada77ea6e286894ddbcc28d2d25b506ab97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'tqtc/lts-6.5' in qt/tqtc-qtwebengineQt Submodule Update Bot2024-02-151-4/+4
| | | | | Change-Id: Id712156182e1656595b895c17799e0df1a1eaec9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update ChromiumMichael Brüning2024-02-143-2/+2
| | | | | | | | | | | | | | | | | | | | | | | 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.5' into tqtc/lts-6.5Michael Brüning2024-02-1331-224/+379
|\ | | | | | | Change-Id: Id38cd1f4a3f446450726644806b588848502d557
| * Remove outdated test for Windows versionMichael Brüning2024-02-121-5/+0
| | | | | | | | | | | | | | | | It silently remained in during the auto-merge and was causing the MSVC- builds to be non-fatally skipped. Change-Id: I73c82f59efc2107ec66cad5017e14990d0a77d0d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Merge remote-tracking branch 'origin/6.6' into 6.5Michael Brüning2024-02-0232-220/+380
| |\ | | | | | | | | | Change-Id: I149f99b0672be030d5d7c5cf6763cd2d0cf4852c
| | * Update ChromiumMichael Brüning2024-02-023-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2024-01-291-4/+4
| | | | | | | | | | | | | | | Change-Id: Idb38d9a59c7ea3dc3a293e75a642b2a32e666308 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Bump version to 6.6.3Jani Heikkinen2024-01-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie66e22f3fecc4b9dbf53e181a97699ee99a59c04 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Delay PdfMultiPageView.goTo[Page|Location] if called too earlyShawn Rutledge2024-01-283-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-244-13/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2024-01-221-4/+4
| | | | | | | | | | | | | | | Change-Id: I10ca844ae7ba7df62aa176ef5e1073ce7ccc66b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Fix cursor position during compositionAnu Aliyas2024-01-213-13/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-193-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2024-01-181-4/+4
| | | | | | | | | | | | | | | Change-Id: I81688266fd731fa23bfccbe5ebab8c94670c0e57 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Fix required version for core and core in host projectMichal Klocek2024-01-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2024-01-171-4/+4
| | | | | | | | | | | | | | | Change-Id: Ic7fbff3e5d9402fa0c8267f69a1cc0cba70485f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Add x86_64 cross compilation target to whitelistMichal Klocek2024-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some builds do x64 bit cross-compilation to x64 bit. Task-number: QTBUG-120692 Change-Id: Id2d0c76c21484dd4ea8cc08430dca6a61b0c50ef Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 295d056aa0c1a4cf520109dddec09b84c2782c04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 409056595012ddd27c63f661d730d56d85d1a071) Reviewed-by: Michael Brüning <michael.bruning@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-129-58/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-125-43/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-124-51/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2024-01-091-4/+4
| | | | | | | | | | | | | | | Change-Id: Ibcc1349869417d09bb06114972c8cdc6372e5d2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on 'tqtc/lts-6.5' in qt/tqtc-qtwebengineQt Submodule Update Bot2024-02-101-4/+4
| | | | | | | | | | | | | | | Change-Id: I8900718d76c96c012c14342aaeab3b21313399d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Merge remote-tracking branch 'origin/6.5' into lts-6.5Michael Brüning2024-02-02357-2466/+7576
|\| | | | | | | | | | | Change-Id: Ia8ecf6dcda16378bbbaa24ca35e58e5d99eebdb3
| * | 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-01331-2352/+6602
| |\ \
| | * | Merge remote-tracking branch 'origin/6.6' into 6.5Michael Brüning2024-02-01339-2355/+7118
| | |\| | | | | | | | | | | | | | | | | | | | | [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-076-1/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 the background color issue in cookiebrowserAnu Aliyas2024-01-072-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cookiebrowser example, all new cookie widgets are added at position 0. Background color of the newly added widget is set based on the color of last inserted cookie widget. Fixes: QTBUG-120446 Pick-to: 6.5 Change-Id: I76fe3ae83b31489365396a2ebcd31d840b2fa857 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 285dfce3c0f8e61228784ef557844c66d44feb1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9eb97b4b3bfefb9c475e3aa5056a8641aa4b102d)
| | | * 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)
| | | * PDF Quick examples: select text in search field when pressing Ctrl-FShawn Rutledge2024-01-072-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better for usability in case the user is doing repeated searches: press control-F and start typing to search for different text, rather than needing to do something else to select or delete the existing text in the search field. Fixes: QTBUG-120447 Pick-to: 6.5 6.2 Change-Id: I8d5a519a631c406dff91198b23a022856609fa4c Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 140edbd6c887c0ae26a054d8c859041c68f06fd7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 274fb4698fa06cf513ce48b71a4f59d3e1608a3c)
| | | * Add missing cmake includeMichal Klocek2024-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the include module build with BUILD_TESTS=ON is broken as cmake function call for dictionary setup is not found. This commit amends 73d58b489e8f4f900042f0ab6c1104e6431752e1. Pick-to: 6.5 Change-Id: I2c02317b92e1b5726963d120bf97dff1a12c7375 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit b50731bffae31729b1c5c43ad7f869b5cc65e81b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3b038efa3762a8e7603529c7882d99b1d92fe6e8)
| | | * 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)
| | | * Update dependencies on '6.6' in qt/qtwebengineQt Submodule Update Bot2023-12-251-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibeb71a59310bd44f1392632a462481317d704a46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * CMake: Fix deployment of QtWebEngine projects on LinuxJoerg Bornemann2023-12-224-1/+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)
| | | * Add icons to recipebrowser exampleMatthias Rauter2023-12-2211-13/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed the qrc file. Fixes: QTBUG-119738 Change-Id: I97e981260fff90e6f9ef3a1ea661d9cf47e6ee45 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 12c5da65fd5195279878add7dd1523672f1f152e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 470621789a73825769d0f83b7c9905e73b99c35a)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 09:07:17 +0000