diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-20 01:00:12 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-20 09:37:57 +0100 |
| commit | 67ac9dead884c7558896bdd97e4d3152100dc7ec (patch) | |
| tree | 000ef894b1f7d649b293cd08c2d8235f72201f19 /src/imports | |
| parent | e5f7c5f2712957d0e1753c629e4cce86a0e6bdbc (diff) | |
| parent | 953e04346773beb5d10c3758a12aae5c82646ae1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/quick/items/qquickitemview.cpp
Change-Id: Ib9faebdbef5eebb80f4e6aeb5b15b5df7494b157
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/labsmodels/qqmldelegatecomponent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/labsmodels/qqmldelegatecomponent.cpp b/src/imports/labsmodels/qqmldelegatecomponent.cpp index b3c9afbb97..4698287fe3 100644 --- a/src/imports/labsmodels/qqmldelegatecomponent.cpp +++ b/src/imports/labsmodels/qqmldelegatecomponent.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlproperty string QtQml.Models::DelegateChoice::roleValue + \qmlproperty variant QtQml.Models::DelegateChoice::roleValue This property holds the value used to match the role data for the role provided by \l DelegateChooser::role. */ QVariant QQmlDelegateChoice::roleValue() const @@ -75,7 +75,7 @@ void QQmlDelegateChoice::setRoleValue(const QVariant &value) } /*! - \qmlproperty index QtQml.Models::DelegateChoice::row + \qmlproperty int QtQml.Models::DelegateChoice::row This property holds the value used to match the row value of model elements. With models that have only the index property (and thus only one column), this property should be intended as an index, and set to the desired index value. @@ -87,7 +87,7 @@ void QQmlDelegateChoice::setRoleValue(const QVariant &value) */ /*! - \qmlproperty index QtQml.Models::DelegateChoice::index + \qmlproperty int QtQml.Models::DelegateChoice::index This property holds the value used to match the index value of model elements. This is effectively an alias for \l row. @@ -109,7 +109,7 @@ void QQmlDelegateChoice::setRow(int r) } /*! - \qmlproperty index QtQml.Models::DelegateChoice::column + \qmlproperty int QtQml.Models::DelegateChoice::column This property holds the value used to match the column value of model elements. */ int QQmlDelegateChoice::column() const |