diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-15 18:22:50 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-15 18:22:50 +0000 |
| commit | eecc5fc52c919d6607e610d858c2749977a1ef75 (patch) | |
| tree | dc8c5f6621d6fbaa76bd28c1c127905444ccf50e /src/corelib/io/qtextstream.cpp | |
| parent | 6b3845320a9242481842243f2c019aa11ce396df (diff) | |
| parent | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 80df3a12e1..9b565bff9d 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -2651,6 +2651,7 @@ QTextStream &QTextStream::operator<<(const char *string) { Q_D(QTextStream); CHECK_VALID_STREAM(*this); + // ### Qt6: consider changing to UTF-8 d->putString(QLatin1String(string)); return *this; } |