diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-11 11:09:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 01:05:43 +0200 |
| commit | 063c08ab8230249ad01c1698ba243b9bb3b238e5 (patch) | |
| tree | 38cd315aaddafc8d3eb93c2acf754d48bba1099c /src/declarative/qml/qdeclarativecompiler_p.h | |
| parent | 576e7ae3360632a981177800e758679ee4105950 (diff) | |
Merge PropertyCache::Data and ValueTypeData
Change-Id: I22cbb159d009151dd77ecbcdad16f27ecb9d6dba
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 5e3ad03924..86471a65a2 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -373,8 +373,8 @@ private: QDeclarativeScript::Property *valueTypeProperty = 0); int genContextCache(); - int genValueTypeData(QDeclarativeScript::Property *prop, QDeclarativeScript::Property *valueTypeProp); - int genPropertyData(QDeclarativeScript::Property *prop); + QDeclarativePropertyCache::Data genValueTypeData(QDeclarativeScript::Property *prop, + QDeclarativeScript::Property *valueTypeProp); int componentTypeRef(); |