diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-11 13:33:34 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-11 13:33:34 (GMT) |
| commit | add515dc7fefd1c6b07ab75d94d033f145293ee4 (patch) | |
| tree | ccd7a18d389b6fe3764f6a4f07e0045abe2185bb /src/corelib/xml/qxmlstream.cpp | |
| parent | a4d19eef86b07d670b8b2a3f9ad6b3448800bae5 (diff) | |
| parent | 59f01a1efe818004fdc9265af6a0e9a05c43932a (diff) | |
| download | Qt-add515dc7fefd1c6b07ab75d94d033f145293ee4.zip Qt-add515dc7fefd1c6b07ab75d94d033f145293ee4.tar.gz Qt-add515dc7fefd1c6b07ab75d94d033f145293ee4.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/xml/qxmlstream.cpp')
| -rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 853f311..91c3a19 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -1523,7 +1523,7 @@ ushort QXmlStreamReaderPrivate::getChar_helper() decoder = codec->makeDecoder(); } - decoder->toUnicode(&readBuffer, rawReadBuffer.data(), nbytesread); + decoder->toUnicode(&readBuffer, rawReadBuffer.constData(), nbytesread); if(lockEncoding && decoder->hasFailure()) { raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content.")); |