diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-03-04 12:18:52 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-04-02 09:43:13 +0000 |
| commit | 4e5ff56a18dc7bb13680a8fbe30ba5aae2dfa206 (patch) | |
| tree | 53b711b3c67576a734913ddcec650ca2251933d7 /src/qml/types/qqmlobjectmodel.cpp | |
| parent | 5cd819d264a932eccbd9d155a81c3c07a2918433 (diff) | |
QQmlInstanceModel: add variantValue()wip/propertycache-refactor
This is necessary in order to add valueRole API to Qt Quick Controls
2's ComboBox.
Make stringValue() non-virtual and have it just call
variantValue().toString().
Task-number: QTBUG-73491
Change-Id: Ic4ecf8370eb0bb8045a967bd589e54dfc1ac5263
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/qml/types/qqmlobjectmodel.cpp')
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index 2f4d427430..b6330b4295 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -273,12 +273,12 @@ QQmlInstanceModel::ReleaseFlags QQmlObjectModel::release(QObject *item) return nullptr; } -QString QQmlObjectModel::stringValue(int index, const QString &name) +QVariant QQmlObjectModel::variantValue(int index, const QString &role) { Q_D(QQmlObjectModel); if (index < 0 || index >= d->children.count()) return QString(); - return QQmlEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString(); + return QQmlEngine::contextForObject(d->children.at(index).item)->contextProperty(role); } QQmlIncubator::Status QQmlObjectModel::incubationStatus(int) |