diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 09:09:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 09:09:21 (GMT) |
| commit | b3e3e9c917786288858eb8b33aa8fe7fa390091c (patch) | |
| tree | 47f2c50a846cd546f4805883a5d46ec3f98b97fd /src/xml/sax/qxml.cpp | |
| parent | eb1f35fa3e1c146369db3814b06a1f5b3013bfa9 (diff) | |
| parent | 4a580b972a90660dc90ef7becea5dfde2a056a4b (diff) | |
| download | Qt-b3e3e9c917786288858eb8b33aa8fe7fa390091c.zip Qt-b3e3e9c917786288858eb8b33aa8fe7fa390091c.tar.gz Qt-b3e3e9c917786288858eb8b33aa8fe7fa390091c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent access to non-existent memory in triagulating stroker
Align GL_RGB lines on a 4-byte boundary when uploading pixmap textures
Cleanup qsqldatabase test case a little bit.
GL2Engine: Don't mark brush as dirty if it hasn't changed
Doc: setFeature snippet was in the wrong place
Diffstat (limited to 'src/xml/sax/qxml.cpp')
| -rw-r--r-- | src/xml/sax/qxml.cpp | 4 |
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) |