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/qquickcontainer.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/qquickcontainer.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontainer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 08129866..f38c2b09 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Container \inherits Control - \instantiates QQuickContainer +//! \instantiates QQuickContainer \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers @@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE \list \li \l incrementCurrentIndex() \li \l decrementCurrentIndex() - \li \l setCurrentIndex(int index) + \li \l setCurrentIndex() \endlist \code @@ -700,7 +700,7 @@ int QQuickContainer::currentIndex() const /*! \qmlmethod void QtQuick.Controls::Container::setCurrentIndex(int index) - Sets the current index of the container. + Sets the current \a index of the container. This method can be called to set a specific current index without breaking existing \c currentIndex bindings. |