diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /src/quicktemplates2/qquickcontainer.cpp | |
parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'src/quicktemplates2/qquickcontainer.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 54e03c81..42423ff3 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -648,7 +648,7 @@ void QQuickContainer::setCurrentIndex(int index) /*! \qmlmethod void QtQuick.Controls::Container::incrementCurrentIndex() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) Increments the current index of the container. @@ -666,7 +666,7 @@ void QQuickContainer::incrementCurrentIndex() /*! \qmlmethod void QtQuick.Controls::Container::decrementCurrentIndex() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) Decrements the current index of the container. |