diff options
author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-11 15:03:50 (GMT) |
---|---|---|
committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-11 15:03:50 (GMT) |
commit | 13f8c2f8772a3fda37f6608e7400398ed88ee1d5 (patch) | |
tree | 512cdcbb78e8832cfab05b22b796769c31ca1c5f /doc/src | |
parent | 54906e67f05e733f363a30dc35ec3a2624cc743d (diff) | |
parent | 8e95dc0968c7660410db954c13545667dbea8ad7 (diff) | |
download | Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.zip Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.gz Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.bz2 |
Merge branches 'master' and 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/datastreamformat.qdoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc index 67a3794..15ac062 100644 --- a/doc/src/datastreamformat.qdoc +++ b/doc/src/datastreamformat.qdoc @@ -301,12 +301,10 @@ \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) |