diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-03 05:44:21 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-03 05:44:21 (GMT) |
| commit | 6d6995e65ba394c842a1bf37c0d5c083aab221a9 (patch) | |
| tree | 91e1a96af1e4b913b140a64243324f03c07d377a /src/declarative/extra | |
| parent | 3c0ea527433dde04ee69c94a3f95f2d2d6b6a02d (diff) | |
| parent | 9440ad04903f2e9c2d3019acc774084fb9a26c79 (diff) | |
| download | Qt-6d6995e65ba394c842a1bf37c0d5c083aab221a9.zip Qt-6d6995e65ba394c842a1bf37c0d5c083aab221a9.tar.gz Qt-6d6995e65ba394c842a1bf37c0d5c083aab221a9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/extra')
| -rw-r--r-- | src/declarative/extra/qmlxmllistmodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index 3b6ffb4..18d33fb 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -121,7 +121,7 @@ public: QString namespaceDeclarations() const; void setNamespaceDeclarations(const QString&); - enum Status { Idle, Loading, Error }; + enum Status { Idle, Loading, Error }; // ### should include Null for consistency? Status status() const; qreal progress() const; |