diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
commit | 3afec43b69991753416380d88e22b5382b8b0832 (patch) | |
tree | 15f14aa78ba2a9cc8c118665318e9e5b77282d8b /src/quicktemplates2 | |
parent | 1a89fbc5a8e9fe6b2711c2e87e9909201c26d499 (diff) | |
parent | 09181d8b61cf3c84c88258586d68bd721d440620 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index c0ce6978..9157b4f9 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -204,7 +204,9 @@ void QQuickAbstractButtonPrivate::handleUngrab() bool QQuickAbstractButtonPrivate::isPressAndHoldConnected() { Q_Q(QQuickAbstractButton); - IS_SIGNAL_CONNECTED(q, QQuickAbstractButton, pressAndHold, ()); + const auto signal = &QQuickAbstractButton::pressAndHold; + const QMetaMethod method = QMetaMethod::fromSignal(signal); + return q->isSignalConnected(method); } void QQuickAbstractButtonPrivate::startPressAndHold() diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index ee7d0ae3..95dd9f93 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -96,6 +96,24 @@ QT_BEGIN_NAMESPACE \li Clips the content \endlist + \section2 Tab Focus + + By default, pressing the tab key while TextArea has + \l {Item::activeFocus}{active focus} results in a tab character being input + into the control itself. To make tab pass active focus onto another item, + use the attached \l KeyNavigation properties: + + \code + TextField { + id: textField + } + + TextArea { + KeyNavigation.priority: KeyNavigation.BeforeItem + KeyNavigation.tab: textField + } + \endcode + \sa TextField, {Customizing TextArea}, {Input Controls} */ |