diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/corelib/serialization/qxmlstream.cpp | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/corelib/serialization/qxmlstream.cpp')
| -rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 827996ee2d..0170be7602 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -223,7 +223,7 @@ QString QXmlStreamReaderPrivate::resolveUndeclaredEntity(const QString &name) The stream reader does \e not take ownership of the resolver. It's the callers responsibility to ensure that the resolver is valid during the entire life-time of the stream reader object, or until - another resolver or 0 is set. + another resolver or \nullptr is set. \sa entityResolver() */ @@ -236,7 +236,7 @@ void QXmlStreamReader::setEntityResolver(QXmlStreamEntityResolver *resolver) /*! \since 4.4 - Returns the entity resolver, or 0 if there is no entity resolver. + Returns the entity resolver, or \nullptr if there is no entity resolver. \sa setEntityResolver() */ @@ -480,7 +480,7 @@ void QXmlStreamReader::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamReader, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ @@ -3315,7 +3315,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamWriter, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ |