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/qdeclarativeparser.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/qdeclarativeparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp index 35bb0f1..d5b9424 100644 --- a/src/declarative/qml/qdeclarativeparser.cpp +++ b/src/declarative/qml/qdeclarativeparser.cpp @@ -225,9 +225,9 @@ QDeclarativeParser::Property::~Property() if (value) value->release(); } -Object *QDeclarativeParser::Property::getValue(const LocationSpan &l) +QDeclarativeParser::Object *QDeclarativeParser::Property::getValue(const LocationSpan &l) { - if (!value) { value = new Object; value->location = l; } + if (!value) { value = new QDeclarativeParser::Object; value->location = l; } return value; } |