summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-04 13:09:32 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-04 13:09:32 (GMT)
commit895e6a4254adf8a2e01e76bc0770d983372d8500 (patch)
treedaeb261d7837415b0416afd93d991459182ecd5e
parentba8d03242f720c11ed89092f3f1a0d8a41f35a04 (diff)
parent08fc3e99ec03714af1b4ac22dd8525b2b31292f4 (diff)
downloadQt-895e6a4254adf8a2e01e76bc0770d983372d8500.zip
Qt-895e6a4254adf8a2e01e76bc0770d983372d8500.tar.gz
Qt-895e6a4254adf8a2e01e76bc0770d983372d8500.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/qml/qmldom.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index f8cf194..e1c4c28 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -612,11 +612,11 @@ QList<QmlDomProperty> QmlDomObject::properties() const
Returns the object's \a name property if a value has been assigned to
it, or an invalid QmlDomProperty otherwise.
- In the example below, \c {object.property("src")} would return a valid
+ In the example below, \c {object.property("source")} would return a valid
QmlDomProperty, and \c {object.property("tile")} an invalid QmlDomProperty.
\qml
-Image { src: "sample.jpg" }
+Image { source: "sample.jpg" }
\endqml
*/
QmlDomProperty QmlDomObject::property(const QByteArray &name) const
@@ -819,7 +819,8 @@ Rect { x: Other.x }
/*!
Construct an empty QmlDomValueBinding.
*/
-QmlDomValueBinding::QmlDomValueBinding()
+QmlDomValueBinding::QmlDomValueBinding():
+ d(new QmlDomBasicValuePrivate)
{
}
@@ -896,7 +897,8 @@ Rect {
/*!
Construct an empty QmlDomValueValueSource.
*/
-QmlDomValueValueSource::QmlDomValueValueSource()
+QmlDomValueValueSource::QmlDomValueValueSource():
+ d(new QmlDomBasicValuePrivate)
{
}