diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
| commit | 388fe97f2a54089544dff0ed3af6ca70bf604716 (patch) | |
| tree | 163b47974c625849726804337bd667c942dfbc77 /src/xml | |
| parent | a0c4b6f34546bdd22167a76a0540d37e9a37c0cf (diff) | |
| parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/dom/qdom.cpp | 2 | ||||
| -rw-r--r-- | src/xml/sax/qxml.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index fedd53f3a9..6498d53b96 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -1951,7 +1951,7 @@ void QDomNodePrivate::setLocation(int lineNumber, int columnNumber) which return a QDomNode, e.g. firstChild(). You can make an independent (deep) copy of the node with cloneNode(). - A QDomNode can be null, much like a null pointer. Creating a copy + A QDomNode can be null, much like \nullptr. Creating a copy of a null node results in another null node. It is not possible to modify a null node, but it is possible to assign another, possibly non-null node to it. In this case, the copy of the null node diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 0e3a87e883..b2fff5b61f 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -2371,7 +2371,7 @@ bool QXmlDefaultHandler::unparsedEntityDecl(const QString&, const QString&, /*! \reimp - Sets \a ret to 0, so that the reader uses the system identifier + Sets \a ret to \nullptr, so that the reader uses the system identifier provided in the XML document. */ bool QXmlDefaultHandler::resolveEntity(const QString&, const QString&, |