1 files changed, 74 insertions, 8 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index cbfd776941..f7b9a58329 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -333,6 +333,12 @@ QVariant QQuickItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
 }
 #endif // im
 
+void QQuickItemKeyFilter::shortcutOverride(QKeyEvent *event)
+{
+    if (m_next)
+        m_next->shortcutOverride(event);
+}
+
 void QQuickItemKeyFilter::componentComplete()
 {
     if (m_next) m_next->componentComplete();
@@ -774,7 +780,7 @@ const SigMap sigMap[] = {
     { 0, 0 }
 };
 
-const QByteArray QQuickKeysAttached::keyToSignal(int key)
+QByteArray QQuickKeysAttached::keyToSignal(int key)
 {
     QByteArray keySignal;
     if (key >= Qt::Key_0 && key <= Qt::Key_9) {
@@ -789,9 +795,9 @@ const QByteArray QQuickKeysAttached::keyToSignal(int key)
     return keySignal;
 }
 
-bool QQuickKeysAttached::isConnected(const char *signalName)
+bool QQuickKeysAttached::isConnected(const char *signalName) const
 {
-    Q_D(QQuickKeysAttached);
+    Q_D(const QQuickKeysAttached);
     int signal_index = d->signalIndex(signalName);
     return d->isSignalConnected(signal_index);
 }
@@ -935,6 +941,46 @@ bool QQuickKeysAttached::isConnected(const char *signalName)
 */
 
 /*!
+    \qmlsignal QtQuick::Keys::shortcutOverride(KeyEvent event)
+    \since 5.9
+
+    This signal is emitted when a key has been pressed that could potentially
+    be used as a shortcut. The \a event parameter provides information about
+    the event.
+
+    Set \c event.accepted to \c true if you wish to prevent the pressed key
+    from being used as a shortcut by other types, such as \l Shortcut. For
+    example:
+
+    \code
+    Item {
+        id: escapeItem
+        focus: true
+
+        // Ensure that we get escape key press events first.
+        Keys.onShortcutOverride: event.accepted = (event.key === Qt.Key_Escape)
+
+        Keys.onEscapePressed: {
+            console.log("escapeItem is handling escape");
+            event.accepted = true;
+        }
+    }
+
+    Shortcut {
+        sequence: "Escape"
+        onActivated: console.log("Shortcut is handling escape")
+    }
+    \endcode
+
+    As with the other signals, \c shortcutOverride will only be emitted for an
+    item if that item has \l {Item::}{activeFocus}.
+
+    The corresponding handler is \c onShortcutOverride.
+
+    \sa Shortcut
+*/
+
+/*!
     \qmlsignal QtQuick::Keys::digit0Pressed(KeyEvent event)
 
     This signal is emitted when the digit '0' has been pressed. The \a event
@@ -1426,6 +1472,16 @@ QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
 }
 #endif // im
 
+void QQuickKeysAttached::shortcutOverride(QKeyEvent *event)
+{
+    Q_D(QQuickKeysAttached);
+    QQuickKeyEvent &keyEvent = d->theKeyEvent;
+    keyEvent.reset(*event);
+    emit shortcutOverride(&keyEvent);
+
+    event->setAccepted(keyEvent.isAccepted());
+}
+
 QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 {
     return new QQuickKeysAttached(obj);
@@ -1510,7 +1566,7 @@ QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) :
     if (itemPrivate)
         itemPrivate->extra.value().layoutDirectionAttached = this;
     else
-        qmlInfo(parent) << tr("LayoutDirection attached property only works with Items and Windows");
+        qmlWarning(parent) << tr("LayoutDirection attached property only works with Items and Windows");
 }
 
 QQuickLayoutMirroringAttached * QQuickLayoutMirroringAttached::qmlAttachedProperties(QObject *object)
@@ -1658,7 +1714,7 @@ QQuickEnterKeyAttached::QQuickEnterKeyAttached(QObject *parent)
         itemPrivate = QQuickItemPrivate::get(item);
         itemPrivate->extra.value().enterKeyAttached = this;
     } else
-        qmlInfo(parent) << tr("EnterKey attached property only works with Items");
+        qmlWarning(parent) << tr("EnterKey attached property only works with Items");
 }
 
 QQuickEnterKeyAttached *QQuickEnterKeyAttached::qmlAttachedProperties(QObject *object)
@@ -4318,7 +4374,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
     }
 
     if (!itemObj && !item->isNull()) {
-        qmlInfo(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow()
+        qmlWarning(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
         v4->throwTypeError();
         return;
@@ -4406,7 +4462,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
     }
 
     if (!itemObj && !item->isNull()) {
-        qmlInfo(this) << "mapToItem() given argument \"" << item->toQStringNoThrow()
+        qmlWarning(this) << "mapToItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
         v4->throwTypeError();
         return;
@@ -5019,6 +5075,13 @@ void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e)
 }
 #endif // im
 
+void QQuickItemPrivate::deliverShortcutOverrideEvent(QKeyEvent *event)
+{
+    if (extra.isAllocated() && extra->keyHandler) {
+        extra->keyHandler->shortcutOverride(event);
+    }
+}
+
 /*!
     Called when \a change occurs for this item.
 
@@ -7652,6 +7715,9 @@ bool QQuickItem::event(QEvent *ev)
     case QEvent::KeyRelease:
         d->deliverKeyEvent(static_cast<QKeyEvent*>(ev));
         break;
+    case QEvent::ShortcutOverride:
+        d->deliverShortcutOverrideEvent(static_cast<QKeyEvent*>(ev));
+        break;
     case QEvent::FocusIn:
         focusInEvent(static_cast<QFocusEvent*>(ev));
         break;
@@ -8323,7 +8389,7 @@ void QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine
 {
     QObjectWrapper::Data *This = static_cast<QObjectWrapper::Data *>(that);
     if (QQuickItem *item = static_cast<QQuickItem*>(This->object())) {
-        foreach (QQuickItem *child, QQuickItemPrivate::get(item)->childItems)
+        for (QQuickItem *child : qAsConst(QQuickItemPrivate::get(item)->childItems))
             QV4::QObjectWrapper::markWrapper(child, e);
     }
     QV4::QObjectWrapper::markObjects(that, e);