diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-23 23:07:23 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:43 +0000 |
| commit | 56bff8f7abc2f0eeadd4d197667132af6eed6f3a (patch) | |
| tree | 13990d34f9239e1845dedaa452bc1093f38b027a /src/qml/types | |
| parent | 86f88521fbea59e8ec53e50cc1e3e68a61f53c40 (diff) | |
Clean up the property key API in StringOrSymbol
Get rid of makeIdentifier(), as toPropertyKey() will take
care of it.
Rename identifier() to propertyKey() and check that the
key is valid.
Remove String/StringOrSymbol::asArrayIndex(), we don't need it
anymore.
Change-Id: I3c490fabc1475c9ea288b49b1638b6fa1bc237b7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 7f3b850e4e..3058ac2069 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -3413,7 +3413,7 @@ public: Q_ASSERT(m->as<QQmlDelegateModelGroupChangeArray>()); const QQmlDelegateModelGroupChangeArray *array = static_cast<const QQmlDelegateModelGroupChangeArray *>(m); - if (id == array->engine()->id_length()->identifier()) { + if (id == array->engine()->id_length()->propertyKey()) { if (hasProperty) *hasProperty = true; return QV4::Encode(array->count()); |