diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
| commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
| tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/quicktemplates2/qquickbutton.cpp | |
| parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
| parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/quicktemplates2/qquickbutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickbutton.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index adbc48fd..a1bea792 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -57,6 +57,10 @@ QT_BEGIN_NAMESPACE a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close, \e Yes, \e No, and \e Help. + Button inherits its API from AbstractButton. For instance, you can set + \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, + and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. + A button emits the signal \l {AbstractButton::}{clicked()} when it is activated by the user. Connect to this signal to perform the button's action. Buttons also provide the signals \l {AbstractButton::}{canceled()}, \l {AbstractButton::}{doubleClicked()}, \l {AbstractButton::}{pressed()}, @@ -77,9 +81,6 @@ QT_BEGIN_NAMESPACE } \endcode - In addition to displaying \l {AbstractButton::}{text}, buttons can also - display an \l [QML]{Button Icons}{icon}. - \sa {Customizing Button}, {Button Controls} */ |