diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 15:28:14 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 15:28:14 (GMT) |
| commit | 5ba5a02e0d905e582a44a313ba0d0e09c6f64067 (patch) | |
| tree | 9fe00ef05b05ed687bd8bec6b4389589243a4b8c /src/declarative/qml/qdeclarativecustomparser.cpp | |
| parent | 3bebd64ec343d85bf53712d1d9863bad9b62391f (diff) | |
| download | Qt-5ba5a02e0d905e582a44a313ba0d0e09c6f64067.zip Qt-5ba5a02e0d905e582a44a313ba0d0e09c6f64067.tar.gz Qt-5ba5a02e0d905e582a44a313ba0d0e09c6f64067.tar.bz2 | |
Fix compilation on INTEGRITY
"Value" and "Object" are reserved words on INTEGRITY
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index 8dd6824..856108c 100644 --- a/src/declarative/qml/qdeclarativecustomparser.cpp +++ b/src/declarative/qml/qdeclarativecustomparser.cpp @@ -131,7 +131,7 @@ QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property * prop.d->values << QVariant::fromValue(props.at(ii)); } else { for(int ii = 0; ii < p->values.count(); ++ii) { - Value *v = p->values.at(ii); + QDeclarativeParser::Value *v = p->values.at(ii); v->type = QDeclarativeParser::Value::Literal; if(v->object) { |