diff options
author | Martin Smith <msmith@trolltech.com> | 2009-05-08 10:46:48 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2009-05-08 10:46:48 (GMT) |
commit | a2d584df2b72ed5bcd4886dcccafd7a54308f36b (patch) | |
tree | f394b25101bc5bb6c3f0bc48e2f3e269e96359a7 /doc/src | |
parent | 2412b0410dcf97cf348ce703722a1b4f7ce623df (diff) | |
parent | d1889402eff75b8dabf67e80c16e3e3316d187e8 (diff) | |
download | Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.zip Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.gz Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
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) |