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/qqmltableinstancemodel_p.h | |
| 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/qqmltableinstancemodel_p.h')
| -rw-r--r-- | src/qml/types/qqmltableinstancemodel_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qqmltableinstancemodel_p.h b/src/qml/types/qqmltableinstancemodel_p.h index 3dd5c4e4ce..39ec66d136 100644 --- a/src/qml/types/qqmltableinstancemodel_p.h +++ b/src/qml/types/qqmltableinstancemodel_p.h @@ -122,7 +122,7 @@ public: QQmlIncubator::Status incubationStatus(int index) override; - QString stringValue(int, const QString &) override { Q_UNREACHABLE(); return QString(); } + QVariant variantValue(int, const QString &) override { Q_UNREACHABLE(); return QVariant(); } void setWatchedRoles(const QList<QByteArray> &) override { Q_UNREACHABLE(); } int indexOf(QObject *, QObject *) const override { Q_UNREACHABLE(); return 0; } |