diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
| commit | 9a9ae6be7d278cdcaf6ac99ea22b3d6cf1093313 (patch) | |
| tree | 616c31b355cd94fd53749fec87cd87df3cfeb1a5 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | 80f1186338bcf8c7d692b4fadfc46531c002c6b0 (diff) | |
| parent | 8ee511bcd9f1376e9995ab3f30f6415ad60b7c05 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Icb923b10d2b6c524ebaa8b38c7979b780e3582d4
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index dcd427f3..199e3408 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype ComboBox \inherits Control - \instantiates QQuickComboBox +//! \instantiates QQuickComboBox \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-input @@ -1586,7 +1586,7 @@ QString QQuickComboBox::textAt(int index) const } /*! - \qmlmethod int QtQuick.Controls::ComboBox::find(string text, flags = Qt.MatchExactly) + \qmlmethod int QtQuick.Controls::ComboBox::find(string text, enumeration flags) Returns the index of the specified \a text, or \c -1 if no match is found. |