diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:45:36 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:47:02 (GMT) |
| commit | 47ec2fd2193f56e02a402df4d0fa9f1b521d07fc (patch) | |
| tree | d4d0af46486c486b25253fde8d4550844dc66dd3 /src/declarative | |
| parent | 274619e086e6e9ebba6c383ffb837dc140c840e7 (diff) | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| download | Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.zip Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.gz Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.bz2 | |
Merge branch 4.8 into qt-4.8-from-4.7
Conflicts:
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'src/declarative')
| -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. |