diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-30 20:53:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-30 22:52:15 +0200 |
| commit | 4010cfbf2d91390f8cae1f6c5dbb352c1f5bf1d2 (patch) | |
| tree | 52b82cc7111af8769f30f0993d5fc3fc9c586de2 /src/corelib/tools/qstring.cpp | |
| parent | d71f9d8c05d70053f2ce46dbb2203309addc0f93 (diff) | |
| parent | ea9003268556154fdc305aa745890fdea92ac46b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b8aa98b160..e8eb04b598 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -9557,7 +9557,7 @@ QByteArray QStringRef::toUtf8() const if (isNull()) return QByteArray(); - return QUtf8::convertFromUnicode(constData(), length(), 0); + return QUtf8::convertFromUnicode(constData(), length()); } /*! |