diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-08-16 09:17:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-17 10:14:22 +0200 |
| commit | aae8df9e39748229dd214f733454e0db404ca7d2 (patch) | |
| tree | 2aebac2d37797da5a9da60829816c109c5fecf5f /src | |
| parent | cc01e0b1e112aac3a0e515f7accbd05ca5a55ecd (diff) | |
Revert "Set IsDirect flag of property cache data if appropriate"
This reverts commit 038619bf2c5e7d2c18a6f463cd994d8b3831e61f.
The commit caused autotest failures.
Change-Id: I46009afde9eb290dda43258e4982b684a87f06d6
Reviewed-on: http://codereview.qt.nokia.com/2992
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativepropertycache.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index 0c595a9db5..d2148ad874 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -247,8 +247,6 @@ QDeclarativePropertyCache::Data QDeclarativePropertyCache::create(const QMetaObj QMetaProperty p = metaObject->property(idx); if (p.isScriptable()) { rv.load(metaObject->property(idx)); - if (!isDynamicMetaObject(cmo)) - rv.flags |= Data::IsDirect; return rv; } else { while (cmo && cmo->propertyOffset() >= idx) @@ -273,8 +271,6 @@ QDeclarativePropertyCache::Data QDeclarativePropertyCache::create(const QMetaObj if (methodNameRef == property) { rv.load(m); - if (!isDynamicMetaObject(m.enclosingMetaObject())) - rv.flags |= Data::IsDirect; return rv; } } |