diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:57:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:57:54 +0200 |
| commit | 20cb55115e5cd6f63c34fb1183a63c1cadd64fe0 (patch) | |
| tree | 19677cf034284576a6519d73fdcc631afc6bcd12 /src/controls/ComboBox.qml | |
| parent | 60319de8e8023d75411fde05ff11d176874cf5b9 (diff) | |
| parent | b5a8306bf6d4949066872ac2afc8d0a01f716bd7 (diff) | |
| download | qtquickcontrols-20cb55115e5cd6f63c34fb1183a63c1cadd64fe0.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ifd50ca8e75940d5b9c27f3f0bf6f4c392e834510
Diffstat (limited to 'src/controls/ComboBox.qml')
| -rw-r--r-- | src/controls/ComboBox.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 5fcba71b..1b92a1ef 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -46,6 +46,7 @@ import QtQuick.Controls.Private 1.0 \inqmlmodule QtQuick.Controls \since 5.1 \ingroup controls + \inherits QtQuickControls1::Control \brief Provides a drop-down list functionality. \image combobox.png |