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
deliverPointerEvent() and deliverSinglePointEventUntilAccepted() already clear the QQuickPointingDeviceExtra::deliveryTargets list before each event delivery (since a97759a336c597327cb82eebc9f45c793aec32c9 and 262d7eb305e1dea8dac660bec3ccc50193258ea9). deliverHoverEvent() needs to do that too: in case there are a lot of hover delivery targets and the user doesn't move the mouse for a long time, but the scene is continuously updated, flushFrameSynchronousEvents() keeps sending hover events, and this list would keep growing if we don't clear it each time. Fixes: QTBUG-135975 Change-Id: Ia91e3c977b45fc964228d3aad89938435f437449 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f43f6e49333aea97856c426a1ecf12afe80c1184) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9fbc709a9381efed45ca8316847f716deee0bd95) (cherry picked from commit b25be970eed9bff96c74c0ab8d78788c72d87035)
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>
In a quick sequence in which one item is tapped, another is tapped, and the first is tapped again: if the first item requires synth-mouse events but the second item accepts touch events, do not give the first item a MouseButtonDblClick event. The intervening touch event in a completely different place should be considered to interrupt the synthetic double-click. In fact we don't even care if it's two different items: if the distance exceeds touchDoubleTapDistance or the time delta exceeds mouseDoubleClickInterval, it's not a double-tap. Refactor the constraint-checking functions, since we're now checking constraints in multiple places. And fix an old mistake in tst_touchmouse while we're at it. QQDAPrivate::isWithinDoubleClickInterval() is meant to be a reusable utility function; use it in QQuickAbstractButtonPrivate::handleRelease() just to prove that it's possible. There are other places where we're checking qApp->styleHints()->mouseDoubleClickInterval() which can potentially be replaced later. The internal doc comment on QQDAPriv::eventInDelivery() is from caecdde22c79b613f82eed81dc7b010caea9f71c Fixes: QTBUG-116442 Change-Id: I2599cfca1ac5ff61ba6124df86d7a9bfe6a836ee Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 8a934630f92ef160acd788855e1689e3912c5a65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 06a7f736295bf009452cae8016ebe28e57ea9bc9) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 75ca1c9a501acd022c6366bcab46490f25f744f5)
When we forceActiveFocus on a QQuickItem we set focus to all ancestor focus scopes, in their parent scope. That involves setting 'item' as the subFocusItem of its immediate focus ancestor. In Qt Quick 3D, where we have different subscenes, we follow the same approach as mentioned above, but at the same time, we would set the item that is getting focus as the activeFocusItem of the scene’s root item and by so doing, we would set the subFocusItem of all focus ancestors of that item to 'item'. This is not entirely correct since each focus ancestor's subFocusItem must be its nearest descendant with focus. But we would then proceed to go up the focus hierarchy of the item and this time try to set its ancestor as the activeFocusItem of the scene’s root, "undoing" what we had done in the previous step. This would cause a lot of unnecessary clearing and setting of the subFocusItem as well as focusIn/out events, and sometimes even infinite loops like in the case of compound controls, like the spinbox, which gives active focus to its textField content once it gains focus. To fix, don't change the subFocusItem of the scene's root item unless we have traversed up all the focus hierarchy. Fixes: QTBUG-120542 Change-Id: Icf08edd2ff8b64662011f66c7137b44750cda9f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 1863c068191601beba0bcdc970185703c8296e3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2f9ef932b4ddcaa32c51a60ce33dd4b6f27724c6) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit e529f8220dc0d50447a71fd788c50432e3793c9d)
The return statement at the end of the method is never reached, due to an earlier, unconditional return just above. Remove it. Task-number: QTBUG-115438 Change-Id: I2750e01de6a34b6cedaf28ab01066e12eb0ac834 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit a997b376c79fb955c4c2344eae7da5fec4853958) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 020ac3d97611c8975147d537db4c52a62fd362b6) (cherry picked from commit 11d2c8228322e8b8af8efc8bbc100e7ef82774cf)