From aabe80ae2895a4d7f115486c1e5f0033f33b6959 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 22 Jun 2014 13:57:26 +0200 Subject: 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 --- src/xml/sax/qxml_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/xml/sax/qxml_p.h') 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 locator; -- cgit v1.2.3