diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-03-25 10:11:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 10:11:02 +0100 |
| commit | cc7c4ba902ae6ab3b5eba80d7075ad8d6183a7ec (patch) | |
| tree | 3533a1dee0103a35e1881fe2e9c7a73f6f2d95de /src/controls/qquickaction.cpp | |
| parent | 76dd99c448ae69cb12a0465facc5dd743b94e624 (diff) | |
| parent | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/qquickaction.cpp')
| -rw-r--r-- | src/controls/qquickaction.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index 3c4bfed6b..541e9a5d3 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -178,6 +178,8 @@ QT_BEGIN_NAMESPACE Emitted when either the menu item or its bound action have been activated. Includes the object that triggered the event if relevant (e.g. a Button or MenuItem). You shouldn't need to emit this signal, use \l trigger() instead. + + The corresponding handler is \c onTriggered. */ /*! \qmlmethod Action::trigger(QObject *source) @@ -191,6 +193,8 @@ QT_BEGIN_NAMESPACE Emitted whenever a action's \l checked property changes. This usually happens at the same time as \l triggered. + + The corresponding handler is \c onToggled. */ QQuickAction::QQuickAction(QObject *parent) |