diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
| commit | 6c067866db65f113237a4c28374317c948da8ba9 (patch) | |
| tree | c8920e1ecbd4c6875691f52d5579e7264fb4af0d /doc/src | |
| parent | 61bec93c12bdc2912b38264386af07f80c3c0272 (diff) | |
| parent | 90a65aa6611eb33229cdc00ffe6c22012944ba1a (diff) | |
| download | Qt-6c067866db65f113237a4c28374317c948da8ba9.zip Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.gz Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/datastreamformat.qdoc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc index 3c651fb..67a3794 100644 --- a/doc/src/datastreamformat.qdoc +++ b/doc/src/datastreamformat.qdoc @@ -69,6 +69,10 @@ the application happens to be running on. \table + \row \o bool + \o \list + \o boolean + \endlist \row \o qint8 \o \list \o signed byte @@ -297,6 +301,12 @@ \o \list \o Milliseconds since midnight (quint32) \endlist + + \row \o QUrl + \o \list + \o Holds an URL (QString) + \endlist + \row \o QVariant \o \list \o The type of the data (quint32) |