aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/doc')
-rw-r--r--src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png (renamed from src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png)bin4969 -> 4969 bytes
-rw-r--r--src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml)8
-rw-r--r--src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml6
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-customize.qdoc10
5 files changed, 15 insertions, 15 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png b/src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png
index 0e9eacbf..0e9eacbf 100644
--- a/src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png
Binary files differ
diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml
index 47c4f606..60f56940 100644
--- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml
@@ -31,12 +31,12 @@ import Qt.labs.controls 1.0
Item {
id: root
width: combo.width
- height: combo.height + combo.panel.contentItem.height
+ height: combo.height + combo.popup.contentItem.height
ComboBox {
id: combo
model: ["First", "Second", "Third"]
- panel.contentItem.parent: root
- panel.contentItem.y: combo.height
+ popup.contentItem.parent: root
+ popup.contentItem.y: combo.height
delegate: ItemDelegate {
width: combo.width
text: modelData
diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml
index d1788d55..0fea67d1 100644
--- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml
+++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml
@@ -31,15 +31,15 @@ import Qt.labs.controls 1.0
Item {
id: root
width: combo.width
- height: combo.height + combo.panel.contentItem.height
+ height: combo.height + combo.popup.contentItem.height
ComboBox {
id: combo
model: ["First", "Second", "Third"]
- panel.contentItem.parent: root
- panel.contentItem.y: combo.height
+ popup.contentItem.parent: root
+ popup.contentItem.y: combo.height
}
Rectangle {
- parent: combo.panel.contentItem
+ parent: combo.popup.contentItem
anchors.fill: parent
color: 'transparent'
border.color: 'red'
diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml
index bac6136d..4d7fe7fd 100644
--- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml
+++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml
@@ -31,13 +31,13 @@ import Qt.labs.controls 1.0
Item {
id: root
width: combo.width
- height: combo.height + combo.panel.contentItem.height
+ height: combo.height + combo.popup.contentItem.height
//! [1]
ComboBox {
id: combo
model: ["First", "Second", "Third"]
- panel.contentItem.parent: root
- panel.contentItem.y: combo.height
+ popup.contentItem.parent: root
+ popup.contentItem.y: combo.height
}
//! [1]
}
diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index eb1dc71d..524cd23a 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -99,7 +99,7 @@
\section1 Customizing ComboBox
ComboBox consists of \l {Control::background}{background},
- \l {Control::contentItem}{content item}, \l {ComboBox::panel}{panel},
+ \l {Control::contentItem}{content item}, \l {ComboBox::popup}{popup},
and \l {ComboBox::delegate}{delegate}.
\section3 Background
@@ -114,11 +114,11 @@
\snippet ComboBox.qml contentItem
- \section3 Panel
+ \section3 Popup
- \image qtlabscontrols-combobox-panel.png
+ \image qtlabscontrols-combobox-popup.png
- \snippet ComboBox.qml panel
+ \snippet ComboBox.qml popup
\section3 Delegate
@@ -240,7 +240,7 @@
\section1 Customizing Menu
- Menu consists of a \l {Panel::}{contentItem}.
+ Menu consists of a \l {Popup::}{contentItem}.
\section3 Content item