diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
tree | d12041105160c1cb21226b365edb9653d87b5853 /src/widgets/widgets/qradiobutton.cpp | |
parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/widgets/widgets/qradiobutton.cpp')
-rw-r--r-- | src/widgets/widgets/qradiobutton.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 284c5f56cf..ac711d34c7 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -80,6 +80,8 @@ void QRadioButtonPrivate::init() \ingroup basicwidgets \inmodule QtWidgets + \image windows-radiobutton.png + A QRadioButton is an option button that can be switched on (checked) or off (unchecked). Radio buttons typically present the user with a "one of many" choice. In a group of radio buttons, only one radio button at @@ -113,15 +115,6 @@ void QRadioButtonPrivate::init() setDown(), isDown(), autoRepeat(), group(), setAutoRepeat(), toggle(), pressed(), released(), clicked(), and toggled(). - \table 100% - \row \li \inlineimage fusion-radiobutton.png Screenshot of a Fusion radio button - \li A radio button shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. - \row \li \inlineimage windowsvista-radiobutton.png Screenshot of a Windows Vista radio button - \li A radio button shown in the \l{Windows Vista Style Widget Gallery}{Windows Vista widget style}. - \row \li \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button - \li A radio button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \endtable - \sa QPushButton, QToolButton, QCheckBox, {fowler}{GUI Design Handbook: Radio Button}, {Group Box Example} */ |