summaryrefslogtreecommitdiffstats
path: root/src/xml/sax/qxml_p.h
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2014-06-22 13:57:26 +0200
committerDavid Faure <david.faure@kdab.com>2014-07-03 10:59:07 +0200
commitaabe80ae2895a4d7f115486c1e5f0033f33b6959 (patch)
tree446241d8c3d808264c1858f50dadb4c367ee1fd1 /src/xml/sax/qxml_p.h
parente26fa6d2066d76b295a71956f67cccc7941c3f32 (diff)
Make QDom/QXmlSimpleReader reentrant.
I moved the evil static bool to QXmlSimpleReaderPrivate, and used it from QDom, when the reader instance is a QXmlSimpleReader (if it's not, nothing happens, like before). Task-number: QTBUG-40015 Change-Id: I54ba89db334d7b086379c4a6840cf0de23f77027 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/xml/sax/qxml_p.h')
-rw-r--r--src/xml/sax/qxml_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h
index 5babd98d13..1cb919a554 100644
--- a/src/xml/sax/qxml_p.h
+++ b/src/xml/sax/qxml_p.h
@@ -148,6 +148,8 @@ private:
// used in QXmlSimpleReader::parseContent() to decide whether character
// data was read
bool contentCharDataRead;
+ // Hack for letting QDom know where the skipped entity occurred
+ bool skipped_entity_in_content;
// helper classes
QScopedPointer<QXmlLocator> locator;