diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2018-07-10 14:56:00 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2018-07-11 04:03:50 +0000 |
| commit | 47b02416bfedbb594eb5bca4e898a652184787d9 (patch) | |
| tree | 23423d15af2057acb84ccd92ff1c5a03d57bfbaf | |
| parent | a187d74d0a1e269f0632a79c65e4f30d9801368d (diff) | |
Doc: Add AbstractButton.TextUnderIcon to display:enumeration list
Task-number: QTBUG-68298
Change-Id: I049ff1de079f065182429f43a20e1a3899f4a962
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png | bin | 0 -> 5980 bytes | |||
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png b/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png Binary files differnew file mode 100644 index 00000000..fc031ce1 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 47ed0fff..0d59d073 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -726,6 +726,7 @@ void QQuickAbstractButton::setIcon(const QQuickIcon &icon) \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols2-button-icononly.png \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols2-button-textonly.png \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols2-button-textbesideicon.png + \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols2-button-textundericon.png \endtable \sa {Control::}{spacing}, {Control::}{padding} |
