diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 14:13:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 14:13:17 +0200 |
| commit | bd4f5a04969b2e69a56c9f735e9376e89ef83690 (patch) | |
| tree | 9703ff644c6cb01c87319dd52be61ef6dcc80e55 /src/quicktemplates2/qquickabstractbutton.cpp | |
| parent | 850f5868b7eef9746c49570ed4c8bfb2c5177ecc (diff) | |
| parent | b311ed261a1176c52e68bf8b23bd4040ac12c7c0 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I3eb4463f8d931257b3e5d5438361f38f2f5b21ce
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 08a59dc0..2100dce2 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -124,13 +124,13 @@ static const int AUTO_REPEAT_INTERVAL = 100; /*! \qmlsignal QtQuick.Controls::AbstractButton::pressed() - This signal is emitted when the button is interactively pressed by the user. + This signal is emitted when the button is interactively pressed by the user via touch, mouse, or keyboard. */ /*! \qmlsignal QtQuick.Controls::AbstractButton::released() - This signal is emitted when the button is interactively released by the user. + This signal is emitted when the button is interactively released by the user via touch, mouse, or keyboard. */ /*! @@ -144,26 +144,26 @@ static const int AUTO_REPEAT_INTERVAL = 100; /*! \qmlsignal QtQuick.Controls::AbstractButton::clicked() - This signal is emitted when the button is interactively clicked by the user. + This signal is emitted when the button is interactively clicked by the user via touch, mouse, or keyboard. */ /*! \since QtQuick.Controls 2.2 (Qt 5.9) \qmlsignal QtQuick.Controls::AbstractButton::toggled() - This signal is emitted when a checkable button is interactively toggled by the user. + This signal is emitted when a checkable button is interactively toggled by the user via touch, mouse, or keyboard. */ /*! \qmlsignal QtQuick.Controls::AbstractButton::pressAndHold() - This signal is emitted when the button is interactively pressed and held down by the user. + This signal is emitted when the button is interactively pressed and held down by the user via touch or mouse. */ /*! \qmlsignal QtQuick.Controls::AbstractButton::doubleClicked() - This signal is emitted when the button is interactively double clicked by the user. + This signal is emitted when the button is interactively double clicked by the user via touch or mouse. */ QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() |