diff options
author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /src/xml | |
parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/dom/qdom.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 17f87804e9..91796106a2 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6666,8 +6666,6 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt } /*! - \nonreentrant - This function parses the XML document from the byte array \a data and sets it as the content of the document. It tries to detect the encoding of the document as required by the XML |