diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:12:23 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:12:25 +0200 |
commit | 3361fcbc28be96262d22fd2b024c85fbcbc61462 (patch) | |
tree | 48976f337b3885971dc1976b9a27cec5e7dfa2ec /src/xml | |
parent | dc612acdc6577594c8f61345cea2de549d7aae34 (diff) | |
parent | 5e342f6f041208d142d97202f61179d7163eb773 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/sax/qxml.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index bedb0ba689..106bdf2dec 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -2948,29 +2948,12 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const \li If enabled, the original prefixed names and attributes used for namespace declarations are reported. - \row \li \e http://trolltech.com/xml/features/report-whitespace-only-CharData - \li true - \li Obsolete, use the following string instead. - If enabled, CharData that consist of - only whitespace characters are reported - using QXmlContentHandler::characters(). If disabled, whitespace is silently - discarded. \row \li \e http://qt-project.org/xml/features/report-whitespace-only-CharData \li true \li If enabled, CharData that consist of only whitespace characters are reported using QXmlContentHandler::characters(). If disabled, whitespace is silently discarded. - \row \li \e http://trolltech.com/xml/features/report-start-end-entity - \li false - \li Obsolete, use the following string instead. - If enabled, the parser reports - QXmlContentHandler::startEntity() and - QXmlContentHandler::endEntity() events, so character data - might be reported in chunks. - If disabled, the parser does not report these events, but - silently substitutes the entities, and reports the character - data in one chunk. \row \li \e http://qt-project.org/xml/features/report-start-end-entity \li false \li If enabled, the parser reports |