diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:44:54 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:44:54 (GMT) |
| commit | 214a26fbde1c5600a10db59217ae9b63a46bce9e (patch) | |
| tree | 601e9edf2832834f0ffef9c7b5c54303ce2f70d2 /src | |
| parent | 7f27ebb0383414f15f391151655e5b09952f8ccd (diff) | |
| parent | ad203bc0bd17be1ade143e38cdc7e8eca26ebc07 (diff) | |
| download | Qt-214a26fbde1c5600a10db59217ae9b63a46bce9e.zip Qt-214a26fbde1c5600a10db59217ae9b63a46bce9e.tar.gz Qt-214a26fbde1c5600a10db59217ae9b63a46bce9e.tar.bz2 | |
Merge branch '4.8'
Conflicts:
doc/src/declarative/righttoleft.qdoc
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativetypeloader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 168c151..82197dc 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -65,6 +65,11 @@ The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data */ /*! + \class QDeclarativeTypeLoader + \internal +*/ + +/*! \enum QDeclarativeDataBlob::Status This enum describes the status of the data blob. |