summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-11 03:40:16 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-11 03:40:16 (GMT)
commit8768193ce3a3dc26508a911e189a084ed72d019a (patch)
treee449ce0bfc37316918dd2414c38a81ddf9c84fb9 /src
parent0de7d028b8ec71109d4d3eba7d15d704e42d76da (diff)
downloadQt-8768193ce3a3dc26508a911e189a084ed72d019a.zip
Qt-8768193ce3a3dc26508a911e189a084ed72d019a.tar.gz
Qt-8768193ce3a3dc26508a911e189a084ed72d019a.tar.bz2
Autotests.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/extra/qmlnumberformatter.cpp2
-rw-r--r--src/declarative/extra/qmlxmllistmodel.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp
index 4007d95..b09be5b 100644
--- a/src/declarative/extra/qmlnumberformatter.cpp
+++ b/src/declarative/extra/qmlnumberformatter.cpp
@@ -108,7 +108,7 @@ QString QmlNumberFormatter::text() const
}
/*!
- \qmlproperty qreal NumberFormatter::number
+ \qmlproperty real NumberFormatter::number
A single point precision number. (Doubles are not yet supported)
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 4f213a8..3d90b44 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -463,7 +463,7 @@ QHash<int,QVariant> QmlXmlListModel::data(int index, const QList<int> &roles) co
for (int i = 0; i < roles.size(); ++i) {
int role = roles.at(i);
int roleIndex = d->roles.indexOf(role);
- rv.insert(role, d->data.at(roleIndex).at(index));
+ rv.insert(role, roleIndex == -1 ? QVariant() : d->data.at(roleIndex).at(index));
}
return rv;
}