diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:41 +0100 |
| commit | 41dd1405d5c5bfac05f9c42a4c4017de5075f5cc (patch) | |
| tree | 4274b78b41dd1676d717e06d81f77e9b52b18974 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | 2f4726883b17fe2c935ac2e5d1bfa9b2bca8b5e3 (diff) | |
| parent | 031a1e89e1baa952225c0f036b605f591f554e9b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id5cd236e14238612647f7a897886be0202863132
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 090b93ce..6aef6391 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols2-focusscopes \brief Combined button and popup list for selecting options. \image qtquickcontrols2-combobox.gif @@ -133,7 +134,7 @@ QT_BEGIN_NAMESPACE \l textRole is not defined, ComboBox is unable to visualize it and throws a \c {ReferenceError: modelData is not defined}. - \sa {Customizing ComboBox}, {Input Controls} + \sa {Customizing ComboBox}, {Input Controls}, {Focus Management in Qt Quick Controls 2} */ /*! |