diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 18:56:41 (GMT) |
| commit | 57c6b39a72e037fe50cda7005cea79d1c4dcd888 (patch) | |
| tree | 1c594add8e5b8598322d2cd88a537e965738cac0 /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | 0a8379d9f01118d7ff0121e6ecbbc0307e1e7f63 (diff) | |
| parent | d340dc6e4b3f1f4f8737d0d1d34e76ae68e007d6 (diff) | |
| download | Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.zip Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.gz Qt-57c6b39a72e037fe50cda7005cea79d1c4dcd888.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index e7b9c9e..afdaee8 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -242,10 +242,10 @@ QDeclarativeComponent::~QDeclarativeComponent() \qmlproperty enumeration Component::status This property holds the status of component loading. It can be one of: \list - \o Null - no data is available for the component - \o Ready - the component has been loaded, and can be used to create instances. - \o Loading - the component is currently being loaded - \o Error - an error occurred while loading the component. + \o Component.Null - no data is available for the component + \o Component.Ready - the component has been loaded, and can be used to create instances. + \o Component.Loading - the component is currently being loaded + \o Component.Error - an error occurred while loading the component. Calling errorsString() will provide a human-readable description of any errors. \endlist */ |