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/qdatastream.cpp | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/corelib/serialization/qdatastream.cpp')
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index cc4efc9be39..ead6ed5083c 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -368,7 +368,7 @@ QDataStream::~QDataStream() /*! \fn QIODevice *QDataStream::device() const - Returns the I/O device currently set, or 0 if no + Returns the I/O device currently set, or \nullptr if no device is currently set. \sa setDevice() @@ -377,7 +377,7 @@ QDataStream::~QDataStream() /*! void QDataStream::setDevice(QIODevice *d) - Sets the I/O device to \a d, which can be 0 + Sets the I/O device to \a d, which can be \nullptr to unset to current I/O device. \sa device() |