diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-07-02 11:52:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-02 06:09:21 +0200 |
| commit | 2d1c7f6348943b9adbab3b940d17896c15636156 (patch) | |
| tree | 00ad9dde8e689f24626961507872059c3ceeda58 /src/quick/items/qquickvisualadaptormodel.cpp | |
| parent | 6ede3b0138bed45f91dfa6b84b662b7f342b45a3 (diff) | |
section.property cannot deal with nested properties
Handle nested property names in section.property.
Task-number: QTBUG-24569
Change-Id: I0ea6003313108b8232bcd3a3015a4dbbd0753cec
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickvisualadaptormodel.cpp')
| -rw-r--r-- | src/quick/items/qquickvisualadaptormodel.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/quick/items/qquickvisualadaptormodel.cpp b/src/quick/items/qquickvisualadaptormodel.cpp index b15513eed2..bc8c75933a 100644 --- a/src/quick/items/qquickvisualadaptormodel.cpp +++ b/src/quick/items/qquickvisualadaptormodel.cpp @@ -457,15 +457,15 @@ public: const_cast<VDMAbstractItemModelDataType *>(this)->release(); } - QString stringValue(const QQuickVisualAdaptorModel &model, int index, const QString &role) const + QVariant value(const QQuickVisualAdaptorModel &model, int index, const QString &role) const { QHash<QByteArray, int>::const_iterator it = roleNames.find(role.toUtf8()); if (it != roleNames.end()) { - return model.aim()->index(index, 0, model.rootIndex).data(*it).toString(); + return model.aim()->index(index, 0, model.rootIndex).data(*it); } else if (role == QLatin1String("hasModelChildren")) { - return QVariant(model.aim()->hasChildren(model.aim()->index(index, 0, model.rootIndex))).toString(); + return QVariant(model.aim()->hasChildren(model.aim()->index(index, 0, model.rootIndex))); } else { - return QString(); + return QVariant(); } } @@ -596,12 +596,12 @@ public: const_cast<VDMListModelInterfaceDataType *>(this)->release(); } - QString stringValue(const QQuickVisualAdaptorModel &model, int index, const QString &role) const + QVariant value(const QQuickVisualAdaptorModel &model, int index, const QString &role) const { QHash<QByteArray, int>::const_iterator it = roleNames.find(role.toUtf8()); return it != roleNames.end() && model - ? model.lmi()->data(index, *it).toString() - : QString(); + ? model.lmi()->data(index, *it) + : QVariant(); } QQuickVisualDataModelItem *createItem( @@ -735,11 +735,11 @@ public: return model.list.count(); } - QString stringValue(const QQuickVisualAdaptorModel &model, int index, const QString &role) const + QVariant value(const QQuickVisualAdaptorModel &model, int index, const QString &role) const { return role == QLatin1String("modelData") - ? model.list.at(index).toString() - : QString(); + ? model.list.at(index) + : QVariant(); } QQuickVisualDataModelItem *createItem( @@ -819,11 +819,11 @@ public: return model.list.count(); } - QString stringValue(const QQuickVisualAdaptorModel &model, int index, const QString &role) const + QVariant value(const QQuickVisualAdaptorModel &model, int index, const QString &role) const { if (QObject *object = model.list.at(index).value<QObject *>()) - return object->property(role.toUtf8()).toString(); - return QString(); + return object->property(role.toUtf8()); + return QVariant(); } QQuickVisualDataModelItem *createItem( |