summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
commit30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch)
tree8483a7b767bb36023f90bca39f8512dc11553f22 /src/xml
parentd170179f00effe691de23167e02ff5aeecaeb054 (diff)
parent2e62227f950aac8205f2b67e4d7d046836b2c799 (diff)
downloadQt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2
Merge remote branch 'origin/master'
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/sax/qxml.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 0a87412..27ec3bd 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -3063,11 +3063,11 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing()
Aspects of the parsing behavior can be adapted using setFeature()
and setProperty().
+ \snippet doc/src/snippets/code/src_xml_sax_qxml.cpp 0
+
QXmlSimpleReader is not reentrant. If you want to use the class
in threaded code, lock the code using QXmlSimpleReader with a
locking mechanism, such as a QMutex.
-
- \snippet doc/src/snippets/code/src_xml_sax_qxml.cpp 0
*/
static inline bool is_S(QChar ch)