diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 01:00:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 01:00:49 +0200 |
| commit | eb606d85b3f1548445cfd1fee43f882da88fb6e7 (patch) | |
| tree | 8d878693d547f6db4641eff3178e2adf97ef98ea /src/corelib/codecs | |
| parent | 30e2bf8712596091c291615bcf9fdcbe58bf3504 (diff) | |
| parent | e227c33455ef364353dd9f6d24934b9c35ff15ec (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: If4974bbf0a166de244dd57cb71b05fa28bcc34ce
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index cac631d770..602b97e32e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1242,7 +1242,7 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba) \obsolete Returns the codec used by QObject::tr() on its argument. If this - function returns 0 (the default), tr() assumes Latin-1. + function returns \nullptr (the default), tr() assumes Latin-1. */ /*! |