Merge tag 'v6.5.10-lts-lgpl' into 6.56.5

Qt 6.5.10-lts-lgpl release

1 files changed, 8 insertions, 5 deletions

diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 4471d6e4b9..57c12d2825 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1751,12 +1751,15 @@ QRectF QQuickTextEdit::cursorRectangle() const
 bool QQuickTextEdit::event(QEvent *event)
 {
     Q_D(QQuickTextEdit);
-    if (event->type() == QEvent::ShortcutOverride) {
-        d->control->processEvent(event, QPointF(-d->xoff, -d->yoff));
-        if (event->isAccepted())
-            return true;
+    bool state = QQuickImplicitSizeItem::event(event);
+    if (event->type() == QEvent::ShortcutOverride && !event->isAccepted()) {
+        QQuickItemPrivate *itemPriv = QQuickItemPrivate::get(this);
+        if (!itemPriv->extra.isAllocated() || !itemPriv->extra->keyHandler) {
+            d->control->processEvent(event, QPointF(-d->xoff, -d->yoff));
+        }
+        state = true;
     }
-    return QQuickImplicitSizeItem::event(event);
+    return state;
 }
 
 /*!