aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml2
-rw-r--r--src/quicktemplates2/qquicktoolbutton.cpp21
2 files changed, 4 insertions, 19 deletions
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
index 561bf358..fd6754f8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
@@ -29,6 +29,7 @@ import QtQuick 2.0
import QtQuick.Layouts 1.0
import QtQuick.Controls 2.0
+//! [1]
ToolBar {
RowLayout {
anchors.fill: parent
@@ -43,3 +44,4 @@ ToolBar {
}
}
}
+//! [1]
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index 58cd7635..c0bb529d 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
@@ -52,26 +52,9 @@ QT_BEGIN_NAMESPACE
ToolButton is functionally similar to \l Button, but provides a look that
is more suitable within a \l ToolBar.
- ### TODO: screenshot
+ \image qtquickcontrols2-toolbar.png
- \code
- ToolBar {
- RowLayout {
- anchors.fill: parent
- ToolButton {
- text: qsTr("< %1").arg(Qt.application.name)
- enabled: stack.depth > 1
- onClicked: stack.pop()
- }
- Item { Layout.fillWidth: true }
- ToolButton {
- text: qsTr("< %1").arg(Qt.application.name)
- enabled: stack.depth > 1
- onClicked: stack.pop()
- }
- }
- }
- \endcode
+ \snippet qtquickcontrols2-toolbar.qml 1
\sa ToolBar, {Customizing ToolButton}, {Button Controls}
*/