diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:02 +0200 |
| commit | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (patch) | |
| tree | 9d5a045b3fea13486cf6108fd9ef641f3a1f5135 /src/xml | |
| parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) | |
| parent | 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
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 |