diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:51:10 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:51:10 (GMT) |
| commit | 48fd47f64f3f73e82016161d82cdf67908a9c653 (patch) | |
| tree | e337d89e525d3a55d2b9aca8c19d2b3b43c65c50 /src/declarative/qml/qdeclarativeparser.cpp | |
| parent | a7b46bda37a428ae2e5554aa8e58469c92b310a9 (diff) | |
| parent | c9b3309ae1d3a34790d71fdfd7dcaab79433f049 (diff) | |
| download | Qt-48fd47f64f3f73e82016161d82cdf67908a9c653.zip Qt-48fd47f64f3f73e82016161d82cdf67908a9c653.tar.gz Qt-48fd47f64f3f73e82016161d82cdf67908a9c653.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
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 0e3d856..b0599ad 100644 --- a/src/declarative/qml/qdeclarativeparser.cpp +++ b/src/declarative/qml/qdeclarativeparser.cpp @@ -226,9 +226,9 @@ QDeclarativeParser::Property::~Property() if (value) value->release(); } -Object *QDeclarativeParser::Property::getValue() +Object *QDeclarativeParser::Property::getValue(const LocationSpan &l) { - if (!value) value = new Object; + if (!value) { value = new Object; value->location = l; } return value; } |