summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorKavindra Devi Palaraja <kavindra.palaraja@nokia.com>2009-04-15 11:04:55 (GMT)
committerKavindra Devi Palaraja <kavindra.palaraja@nokia.com>2009-04-15 11:04:55 (GMT)
commit30faadc821ef24fbd9ee651a35098e1e1ec6eb96 (patch)
tree00ff53b69705685b39b7e20a89978c5eb330268d /doc/src
parentdbb9dc164ccef29ec7cee381706edf8775fcc828 (diff)
parent8fc0d4ed0d306e131276ce6e4dd236ca42582d9a (diff)
downloadQt-30faadc821ef24fbd9ee651a35098e1e1ec6eb96.zip
Qt-30faadc821ef24fbd9ee651a35098e1e1ec6eb96.tar.gz
Qt-30faadc821ef24fbd9ee651a35098e1e1ec6eb96.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/examples/qxmlstreambookmarks.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc
index 7059043..fb3a1c1 100644
--- a/doc/src/examples/qxmlstreambookmarks.qdoc
+++ b/doc/src/examples/qxmlstreambookmarks.qdoc
@@ -103,8 +103,9 @@
The \c read() function accepts a QIODevice and sets it using
\l{QXmlStreamReader::setDevice()}{setDevice()}. The actual process
- of reading only takes place in event the file is a valid XBEL 1.0
- file. Otherwise, the \l{QXmlStreamReader::raiseError()}
+ of reading only takes place if the file is a valid XBEL 1.0 file.
+ Note that the XML input needs to be well-formed to be accepted by
+ QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()}
{raiseError()} function is used to display an error message.
\snippet examples/xml/streambookmarks/xbelreader.cpp 1