aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/doc/src')
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-customize.qdoc32
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-index.qdoc3
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-input.qdoc6
3 files changed, 41 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index a7bd7d8b..eb1dc71d 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -95,6 +95,38 @@
\snippet CheckBox.qml indicator
+
+ \section1 Customizing ComboBox
+
+ ComboBox consists of \l {Control::background}{background},
+ \l {Control::contentItem}{content item}, \l {ComboBox::panel}{panel},
+ and \l {ComboBox::delegate}{delegate}.
+
+ \section3 Background
+
+ \image qtlabscontrols-combobox-background.png
+
+ \snippet ComboBox.qml background
+
+ \section3 Content item
+
+ \image qtlabscontrols-combobox-contentItem.png
+
+ \snippet ComboBox.qml contentItem
+
+ \section3 Panel
+
+ \image qtlabscontrols-combobox-panel.png
+
+ \snippet ComboBox.qml panel
+
+ \section3 Delegate
+
+ \image qtlabscontrols-combobox-delegate.png
+
+ \snippet ComboBox.qml delegate
+
+
\section1 Customizing Dial
Dial consists of two visual items: \l {Control::background}{background}
diff --git a/src/imports/controls/doc/src/qtlabscontrols-index.qdoc b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc
index 936e65e8..6e486ff0 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-index.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc
@@ -219,6 +219,9 @@
\li \l [QtQuickControls] {CheckBox}
\li \l [QtLabsControls] {CheckBox}
\row
+ \li \l [QtQuickControls] {ComboBox}
+ \li \l [QtLabsControls] {ComboBox}
+ \row
\li \l [QtQuickControls] {ExclusiveGroup}
\li \l [QtLabsControls] {ButtonGroup}
\row
diff --git a/src/imports/controls/doc/src/qtlabscontrols-input.qdoc b/src/imports/controls/doc/src/qtlabscontrols-input.qdoc
index 130ca83d..06c0b40d 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-input.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-input.qdoc
@@ -38,6 +38,12 @@
following sections offer guidelines for choosing the appropriate type
of input control, depending on the use case.
+ \section1 ComboBox Control
+
+ \image qtlabscontrols-combobox.png
+
+ \l ComboBox is used to select a value from a drop-down list.
+
\section1 Dial Control
\image qtlabscontrols-dial.png