diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 19:02:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 15:27:31 +0100 |
commit | c051ea15c75851132d08f22825d84d4ea3f49241 (patch) | |
tree | ea3aa28296355f313d204f6e190f74cfd87dee0a /src/declarative/qml/qdeclarativetypeloader.cpp | |
parent | dc5c8d1099ac851b51accf5f87c5be4fc1610c1a (diff) |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativetypeloader.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativetypeloader.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 7b450ecb..1c624224 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -102,14 +102,14 @@ The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data This enum describes the status of the data blob. \list -\o Null The blob has not yet been loaded by a QDeclarativeDataLoader -\o Loading The blob is loading network data. The QDeclarativeDataBlob::setData() callback has not yet been +\li Null The blob has not yet been loaded by a QDeclarativeDataLoader +\li Loading The blob is loading network data. The QDeclarativeDataBlob::setData() callback has not yet been invoked or has not yet returned. -\o WaitingForDependencies The blob is waiting for dependencies to be done before continueing. This status +\li WaitingForDependencies The blob is waiting for dependencies to be done before continueing. This status only occurs after the QDeclarativeDataBlob::setData() callback has been made, and when the blob has outstanding dependencies. -\o Complete The blob's data has been loaded and all dependencies are done. -\o Error An error has been set on this blob. +\li Complete The blob's data has been loaded and all dependencies are done. +\li Error An error has been set on this blob. \endlist */ @@ -119,9 +119,9 @@ dependencies. This enum describes the type of the data blob. \list -\o QmlFile This is a QDeclarativeTypeData -\o JavaScriptFile This is a QDeclarativeScriptData -\o QmldirFile This is a QDeclarativeQmldirData +\li QmlFile This is a QDeclarativeTypeData +\li JavaScriptFile This is a QDeclarativeScriptData +\li QmldirFile This is a QDeclarativeQmldirData \endlist */ @@ -486,9 +486,9 @@ To complete processing, the QDeclarativeDataBlob::done() callback is invoked. d one of these three preconditions are met. \list 1 -\o The QDeclarativeDataBlob has no dependencies. -\o The QDeclarativeDataBlob has an error set. -\o All the QDeclarativeDataBlob's dependencies are themselves "done()". +\li The QDeclarativeDataBlob has no dependencies. +\li The QDeclarativeDataBlob has an error set. +\li All the QDeclarativeDataBlob's dependencies are themselves "done()". \endlist Thus QDeclarativeDataBlob::done() will always eventually be called, even if the blob has an error set. |