From 3b4ef95d18631845d34e63186fdf76124443ac79 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 20 Jul 2009 11:00:52 +1000 Subject: Add missing docs. --- src/declarative/extra/qmlxmllistmodel.cpp | 4 ++++ src/declarative/fx/qfximage.cpp | 6 ++++++ src/declarative/util/qmllistmodel.cpp | 4 ++++ 3 files changed, 14 insertions(+) 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 QmlXmlListModel::data(int index, const QList &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/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 QmlListModel::data(int index, const QList &roles) const return rv; } +/*! + \qmlproperty int ListModel::count + The number of data entries in the model. +*/ int QmlListModel::count() const { if (!_root) return 0; -- cgit v0.12 From 0eaa2231ed4e3acc0c1411492c13d9057d1caa00 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 20 Jul 2009 11:54:56 +1000 Subject: Compile fix. --- src/corelib/kernel/qmetaobjectbuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index e6817fe..d655e3f 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmetaobjectbuilder_p.h" -#include +#include QT_BEGIN_NAMESPACE -- cgit v0.12 From 2193f4d417d94530e7d2f1948de03372b02dcdcf Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 20 Jul 2009 12:04:21 +1000 Subject: Fix warning. --- src/declarative/qml/qmlcompiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v0.12