diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-03 15:43:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 16:11:58 +0200 |
| commit | 6dac3f18941bd2d66218ec43f08e4fb9be869c63 (patch) | |
| tree | f2664c9f31d5046f38a1403f46eb0fc162d5242c /src/corelib/io/qdebug.h | |
| parent | b4dabb9e50ce26469b0b7d71e168463abf727334 (diff) | |
| parent | 1e49914fee099c4c0d634743326b50ad02e6c8f1 (diff) | |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'src/corelib/io/qdebug.h')
| -rw-r--r-- | src/corelib/io/qdebug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 48a382eea6..34abb5b75b 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -85,7 +85,7 @@ public: QT_TRY { qt_message_output(stream->type, stream->context, - stream->buffer.toLocal8Bit().data()); + stream->buffer); } QT_CATCH(std::bad_alloc&) { /* We're out of memory - give up. */ } } delete stream; |