diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 19:13:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 19:13:57 +0200 |
| commit | f281054d12b53b95df3926e54ac6a99ecf9bc3ca (patch) | |
| tree | 7d30a747cb0d320a068a7bbe3648e7f10ba68d8f /src/declarative/util/qdeclarativelistaccessor.cpp | |
| parent | 87b91f933735aa2b7c2295fb8d1cf0692ccf2422 (diff) | |
| parent | 7bf5bb1a7f54f775534a3d940c44d3bf78725306 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I10d9b8383a41aa427793c6ccfdbf0393064d9c49
Diffstat (limited to 'src/declarative/util/qdeclarativelistaccessor.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativelistaccessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index efc51979..e2d5c064 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -91,7 +91,7 @@ int QDeclarativeListAccessor::count() const case VariantList: return qvariant_cast<QVariantList>(d).count(); case ListProperty: - return ((QDeclarativeListReference *)d.constData())->count(); + return ((const QDeclarativeListReference *)d.constData())->count(); case Instance: return 1; case Integer: @@ -111,7 +111,7 @@ QVariant QDeclarativeListAccessor::at(int idx) const case VariantList: return qvariant_cast<QVariantList>(d).at(idx); case ListProperty: - return QVariant::fromValue(((QDeclarativeListReference *)d.constData())->at(idx)); + return QVariant::fromValue(((const QDeclarativeListReference *)d.constData())->at(idx)); case Instance: return d; case Integer: |