diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:04 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:53 +0100 |
commit | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (patch) | |
tree | 1c3dec7b83ebd2bef910075889dc2c39697933ea /src/quick/items/qquickitem.cpp | |
parent | a9bef84675f6b67bb88a2bb99e45aba889795251 (diff) | |
parent | 2f9099443d9acd6583e92785afbb38b2e4dcbfd5 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 8a11e31b9f..110a8b7586 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -851,7 +851,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName) \list 1 \li Items specified in \c forwardTo \li specific key handlers, e.g. onReturnPressed - \li onKeyPress, onKeyRelease handlers + \li onPressed, onReleased handlers \li Item specific key handling, e.g. TextInput key handling \li parent item \endlist @@ -862,7 +862,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName) \li Item specific key handling, e.g. TextInput key handling \li Items specified in \c forwardTo \li specific key handlers, e.g. onReturnPressed - \li onKeyPress, onKeyRelease handlers + \li onPressed, onReleased handlers \li parent item \endlist |