path: root/src/imports/controls/doc/src
diff options
authorJ-P Nurmi <jpnurmi@qt.io>2016-11-03 18:20:15 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-11-03 19:20:42 +0100
commit6c88fe58a6037d252f40bf00aa5052b0f724a862 (patch)
tree9afdf0b638bc89e5e71eeac7b3c06ed53831e45b /src/imports/controls/doc/src
parent83cbe4e899d2d22e923bdc10e90f91ef106edf58 (diff)
parent3f646aca34c25f7cc36df2f988790bb238026422 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/ProgressBar.qml src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickstackview.cpp Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
Diffstat (limited to 'src/imports/controls/doc/src')
1 files changed, 18 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
index 610fc69e..434cf839 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
@@ -127,6 +127,24 @@
\b {See also} \l RadioButton
+ \section1 RoundButton Control
+ \l RoundButton is a clickable control that starts an action, or opens or
+ closes a popup. A round button with a square image icon or one-letter font
+ icon is circular. A circular RoundButton takes less space than a normal
+ \l Button, and can also be used as a floating action button.
+ \image qtquickcontrols2-roundbutton.png
+ Recommendations:
+ \list
+ \li Keep labels short and concise.
+ \li If the text is localized, consider the influence of a longer text on the layout.
+ \endlist
+ \b {See also} \l RoundButton
\section1 Switch Control
\image qtquickcontrols2-switch.png