Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 15 insertions, 1 deletions

diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 7f0029d..91ad538 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -432,6 +432,10 @@ QHash<int,QVariant> QmlXmlListModel::data(int index, const QList<int> &roles) co
     return rv;
 }
 
+/*!
+    \qmlproperty int XmlListModel::count
+    The number of data entries in the model.
+*/
 int QmlXmlListModel::count() const
 {
     Q_D(const QmlXmlListModel);
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 027b22a..69030d2 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -464,6 +464,12 @@ QUrl QFxImage::source() const
     return d->url;
 }
 
+/*!
+    \qmlproperty bool Image::preserveAspect
+
+    Whether the image's aspect ratio should be preserved when resizing. By default this
+    is false.
+*/
 bool QFxImage::preserveAspect() const
 {
     Q_D(const QFxImage);
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 138be29..477e6a5 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -940,7 +940,7 @@ bool QmlCompiler::buildComponent(QmlParser::Object *obj,
         COMPILE_EXCEPTION(obj, "Invalid component id specification");
 
     if (idProp) {
-        QString idVal = idProp->values.first()->primitive().toUtf8();
+        QString idVal = idProp->values.first()->primitive();
 
         if (compileState.ids.contains(idVal))
             COMPILE_EXCEPTION(obj, "id is not unique");
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 61d32f4..8edd871 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -331,6 +331,10 @@ QHash<int,QVariant> QmlListModel::data(int index, const QList<int> &roles) const
     return rv;
 }
 
+/*!
+    \qmlproperty int ListModel::count
+    The number of data entries in the model.
+*/
 int QmlListModel::count() const
 {
     if (!_root) return 0;