diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
| commit | fc54db69809a16f613f65a2761fab55d5911b02c (patch) | |
| tree | a00d9284eb13f81f5b195f8a4c6cfee03edb4f17 /src/declarative/qml/qdeclarativelist.cpp | |
| parent | 35275892ca8a7046451b8e943985dd779fee4794 (diff) | |
| parent | 2557ff5a940242b398dee65c3c79cec088164e32 (diff) | |
| download | qtdeclarative-fc54db69809a16f613f65a2761fab55d5911b02c.tar.gz | |
Merge branch 'master' into animation-refactor
Conflicts:
tools/qmlviewer/qdeclarativetester.cpp
tools/qmlviewer/qmlruntime.cpp
Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa
Diffstat (limited to 'src/declarative/qml/qdeclarativelist.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativelist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp index 04cef6c737..c717ed0509 100644 --- a/src/declarative/qml/qdeclarativelist.cpp +++ b/src/declarative/qml/qdeclarativelist.cpp @@ -135,8 +135,8 @@ QDeclarativeListReference::QDeclarativeListReference(QObject *object, const char { if (!object || !property) return; - QDeclarativePropertyCache::Data local; - QDeclarativePropertyCache::Data *data = + QDeclarativePropertyData local; + QDeclarativePropertyData *data = QDeclarativePropertyCache::property(engine, object, QLatin1String(property), local); if (!data || !data->isQList()) return; |