diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:25:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:27:02 (GMT) |
| commit | 912b9329a4d52e0260683b714976b166d1f56779 (patch) | |
| tree | 47bb0252a0e4cdd5b1e40fc0d72ab962d33f0ec8 /src/declarative/qml/qmldom.cpp | |
| parent | 7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e (diff) | |
| parent | ab4269502cda34abef9fb52161405bd1f6172791 (diff) | |
| download | Qt-912b9329a4d52e0260683b714976b166d1f56779.zip Qt-912b9329a4d52e0260683b714976b166d1f56779.tar.gz Qt-912b9329a4d52e0260683b714976b166d1f56779.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
src/declarative/qml/qmlengine_p.h
Diffstat (limited to 'src/declarative/qml/qmldom.cpp')
| -rw-r--r-- | src/declarative/qml/qmldom.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 2aaf492..9e12485 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -765,8 +765,11 @@ Text { id: MyText } */ QString QmlDomObject::objectId() const { - if (d->object) return d->object->id; - else return QByteArray(); + if (d->object) { + return d->object->id; + } else { + return QString(); + } } /*! |