diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
| commit | 9a76a90b1944db52bd4180d27c01781fbb3499d4 (patch) | |
| tree | 46ac1557761e30127330520d2fa6412305e07443 /src/corelib/io/qdebug.h | |
| parent | b5fe99c0105a9791e34a8b959822430497a4aeb9 (diff) | |
| parent | b9907e309885b4b8ce280c721231a56a583b51d0 (diff) | |
| download | Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.zip Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.gz Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.bz2 | |
Merge remote branch 'origin/4.6' into bearermanagement/integration
Conflicts:
src/s60installs/s60installs.pro
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 1c68716..bc68599 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -83,7 +83,7 @@ public: if(stream->message_output) { QT_TRY { qt_message_output(stream->type, stream->buffer.toLocal8Bit().data()); - } QT_CATCH(std::bad_alloc) { /* We're out of memory - give up. */ } + } QT_CATCH(std::bad_alloc&) { /* We're out of memory - give up. */ } } delete stream; } |