diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-27 08:40:55 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-27 08:41:33 +0100 |
commit | d3814e51bb1c19aa868566aea5d4edd19d2e3944 (patch) | |
tree | 1d7606bd0cb1167cecc733141998a2d0cca918d7 /src/xml/dom/qdom.h | |
parent | 719ad1db552319529bb5978fabbae1af9a06c240 (diff) | |
parent | 2260d680c935eae0e989beb2040a01040f66a5fa (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5bdfe94f7eec1ba328c4a4b54d12dbc0da7fc3ac
Diffstat (limited to 'src/xml/dom/qdom.h')
-rw-r--r-- | src/xml/dom/qdom.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 2d07e34f3b..84abaea53e 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -91,6 +91,7 @@ class QDomNode; class QDomEntity; class QDomNotation; class QDomCharacterData; +class QXmlStreamReader; class Q_XML_EXPORT QDomImplementation { @@ -343,6 +344,8 @@ public: bool setContent(const QString& text, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr ); bool setContent(QIODevice* dev, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr ); bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr ); + bool setContent(QXmlStreamReader *reader, bool namespaceProcessing, QString *errorMsg = nullptr, + int *errorLine = nullptr, int *errorColumn = nullptr); // Qt extensions QString toString(int = 1) const; |