summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qdebug.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-04-02 13:48:06 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-20 08:37:06 +0200
commitd9a1c2dff85635076ecaee3507427d750846c85c (patch)
tree5c60ddcb7815b6ea1789c84c7972ddda2e0a4e85 /src/corelib/io/qdebug.h
parenta3f90fd44f822ae9d77c9d115934e18a9c7466fd (diff)
Logging: Change arguments of message handler to avoid conversions
Introduce a new QtMessageHandler that takes QString instead of char *: This avoids converting to local8bit , only to convert it back to utf16 for Windows. The old QMessageHandler is kept for a transition period, but will be removed before Qt 5.0. Also fix qEmergencyOut (that is called in OOM situations) to not rely on the default message handler. Change-Id: Iee0ce5838f97175c98788b847964273dd22d4a37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdebug.h')
-rw-r--r--src/corelib/io/qdebug.h2
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;