diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-19 20:44:35 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-19 20:46:59 +0200 |
| commit | a451c1a4ad20320a096e997c7173a3c61e8051d4 (patch) | |
| tree | 935f7bcf494b0088b16464883f111e8241ab6e28 /src/quicktemplates2/qquicktumbler.cpp | |
| parent | dba57ed6f4c9fda4b6fd8b1aa1d61c31dcebd85e (diff) | |
| parent | 124dd9adb5882048e44dcd012e08899d4e480196 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I3da1888c76e3082225ef7e3b0c83fbbf2aaed4cd
Diffstat (limited to 'src/quicktemplates2/qquicktumbler.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktumbler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index 8d0aa4d4..068720bb 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE \ingroup qtquickcontrols2-input \brief A spinnable wheel of items that can be selected. + \image qtquickcontrols2-tumbler-wrap.gif + \code Tumbler { model: 5 @@ -80,8 +82,6 @@ QT_BEGIN_NAMESPACE \snippet qtquickcontrols2-tumbler-timePicker.qml tumbler - \image qtquickcontrols2-tumbler-wrap.gif - \sa {Customizing Tumbler}, {Input Controls} */ @@ -364,7 +364,7 @@ QQuickItem *QQuickTumbler::currentItem() const } /*! - \qmlproperty component QtQuick.Controls::Tumbler::delegate + \qmlproperty Component QtQuick.Controls::Tumbler::delegate This property holds the delegate used to display each item. */ |