Qt 6.5.10-lts release Conflicts solved: dependencies.yaml Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8
Qt 6.5.7-lts release Conflicts solved: dependencies.yaml Change-Id: I8fbe9c1606825b726adf95e69a4fa86e2196f4e8
The delivery agent generally accepts key events before sending them to the quick item; the corresponding item can further accept or ignore those events. The reason that the user can't override the shortcut key event in the quick text edit is that these events are marked as accepted by default in the delivery agent, and the quick text edit also doesn't explicitly handle the read-only case, which causes the event state to remain as accepted. This patch ignores the shortcut override event by default in the delivery agent. Also, make the quick text edit to execute the configured key handler to either accept or ignore before processing the events. This gives the chance to execute the required shortcut actions. Fixes: QTBUG-136959 Change-Id: Ib6400f083f4e21d1b23db87b002acb1cbd4ac82b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1aefea26e5a574dad25646d330a6b3bb943a596c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f00ec31e8a0c832ffffafb1ab42152db3b8db66e) (cherry picked from commit d7ee847bd6260367de35632235a449efedba698e) (cherry picked from commit 4e33f11c0a5c88f730f720a695dd6bb3f98b9428)
Qt 6.5.6-lts release Conflicts solved: dependencies.yaml Change-Id: I9ee692350de5ba94eb25021b6246c2b397570e76
Qt 6.5.5-lts release Conflicts solved: dependencies.yaml src/quick/doc/snippets/qml/treeview/qml-customdelegate.qml Change-Id: Ifa297315fa0e6e70d9f26312f9183da4769d18fc
This reverts commit da5933f22c00270ac9083a089686e5c54e0057da. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
When Item LayoutMirroring changes and mirrorChange() gets called, update the document properly. Task-number: QTBUG-124922 Change-Id: I2b8a0e05ae3f0479eed68c0a7f84b23ba8d56e76 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit bc722385fbfba625b9fba6fac035a2982820eab9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 07a7b349e20b813cafb3b55697027f8e9de6a753) (cherry picked from commit 629bb4f89405362de20c09891a29c13496141f5c)
There was already a hook in text components to update when the renderType was set to Text.NativeRendering. This is necessary because the text is rendered into a glyph cache at a given size and scaling it further will give pixelation artifacts. However, there are cases where the NativeRendering backend is used implicitly. In particular this happens for color fonts, so when changing the dpr of a screen (or when moving the window to a screen with a different dpr) we would get pixelated emojis in some cases. The fix is to detect in the text node whether any glyphs use the NativeRendering backend and if they do, we update whenever the dpr changes. Fixes: QTBUG-121449 Change-Id: I9ad62d792e495d4439715fe87acfd87dd1833c67 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 23ae81c84de8bb30ba2d779c603a5b3aded2a417) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 4a85b870e4fa4febdc262f9a3060177bf86f6b5a) (cherry picked from commit 4da6490b6e5ee840fa81e6a91da4251989fbcd92)
Qml TextEdit does not call polish() in the setter for horizontal alignment. The test that tests horizontal alignment for TextEdit is broken, creating a Text item instead of a TextEdit and therefore calling the wrong setter. This test also has a false positive as a result of an unnecessary subtraction. Fixes: QTBUG-56921 Pick-to: 6.2 5.15 Change-Id: I21df3c4f403980fb5512abfd5e7e32a064cd60d7 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit e7d0395b47a110a4f35518b18b479535a1cf9ed1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d7453add34821aaa0e150e65913683e9240f074a)
I don't fully understand the previous logic behind keeping the same firstDirtyPos while we iterate all the frames. In case a document contains a mix of tables and text for example, we may iterate to a block in the root frame that is just beyond the first table, and set firstDirtyPos accordingly (which I think is meant to say that everything up to that character position has been rendered, but it's not true at that moment in time); and then when we look at the frame corresponding to the first table, rule out rendering the whole frame or any of its blocks based on the fact that it comes _before_ firstDirtyPos. The fact that we got past its position in the root frame should not preclude rendering the nested frame. So now it looks safer to reset firstDirtyPos before iterating each nested frame. Anyway the logic from f513e88403b66c4a5efe4c62c160dfce151efb33 assumed that we wanted to populate the whole document into the scene graph, and should just avoid redoing work while keeping the nodes up-to-date; whereas since 9db23e0e04906cf9ea33e23fa41f34955e5e6fe0 we're trying to avoid populating nodes too far outside the viewport. That's probably the bigger optimization: if we are avoiding most of the blocks in large documents most of the time, redoing work to render the ones that are in the viewport is not such a big deal. And it seems dangerous to preemptively skip frames or blocks before we've checked whether they are in the viewport. So now we visit all frames regardless of firstDirtyPos, but still skip blocks within the frame that are beyond the bottom of the viewport. And whenever we do render the first block that is beyond the viewport, we also enlarge our local copy of the viewport rectangle to encompass that block's bounds, to ensure that when we visit nested frames, we will also render other blocks within the enlarged bounds. Effectively this means if we render the next block in the root frame immediately past a table, we will also render all cells in the lower part of that table (between the top of the viewport and the bottom of the table). That might result in more SG nodes than we strictly need (outside the viewport bounds); but at the end, the stored QQuickTextEditPrivate::renderedRegion must include that one block that was past the table, so we want all intervening blocks too. QQuickTextEditPrivate::transformChanged() will not call update() if renderedRegion tells it that the coverage is complete within the current viewport, and nothing more needs to be rendered. That was the root of this bug. The autotest just counts the number of blocks rendered at different scroll positions in a Flickable. Perhaps it will turn out to be sensitive to font sizes on various platforms; but the number of blocks rendered was way too small in case of the bug, so we can afford a tolerance in the comparison, if needed. Fixes: QTBUG-118636 Change-Id: Id1f2b393f26e2dd5b198e9d5251e8c33459c3c07 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit db112ff02952437544dad9503b22785b3ff24e99) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c30b3e4f96f87b6d350a449d23820ae2f13b3363)