aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickvisualadaptormodel_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2012-07-02 11:52:08 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-02 06:09:21 +0200
commit2d1c7f6348943b9adbab3b940d17896c15636156 (patch)
tree00ad9dde8e689f24626961507872059c3ceeda58 /src/quick/items/qquickvisualadaptormodel_p.h
parent6ede3b0138bed45f91dfa6b84b662b7f342b45a3 (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_p.h')
-rw-r--r--src/quick/items/qquickvisualadaptormodel_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickvisualadaptormodel_p.h b/src/quick/items/qquickvisualadaptormodel_p.h
index dba65e197e..5176921a51 100644
--- a/src/quick/items/qquickvisualadaptormodel_p.h
+++ b/src/quick/items/qquickvisualadaptormodel_p.h
@@ -69,8 +69,8 @@ public:
virtual int count(const QQuickVisualAdaptorModel &) const { return 0; }
virtual void cleanup(QQuickVisualAdaptorModel &, QQuickVisualDataModel * = 0) const {}
- virtual QString stringValue(const QQuickVisualAdaptorModel &, int, const QString &) const {
- return QString(); }
+ virtual QVariant value(const QQuickVisualAdaptorModel &, int, const QString &) const {
+ return QVariant(); }
virtual QQuickVisualDataModelItem *createItem(
QQuickVisualAdaptorModel &,
@@ -113,8 +113,8 @@ public:
inline const QListModelInterface *lmi() const { return static_cast<const QListModelInterface *>(object()); }
inline int count() const { return qMax(0, accessors->count(*this)); }
- inline QString stringValue(int index, const QString &role) const {
- return accessors->stringValue(*this, index, role); }
+ inline QVariant value(int index, const QString &role) const {
+ return accessors->value(*this, index, role); }
inline QQuickVisualDataModelItem *createItem(QQuickVisualDataModelItemMetaType *metaType, QQmlEngine *engine, int index) {
return accessors->createItem(*this, metaType, engine, index); }
inline bool hasProxyObject() const {