summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-04-29 12:33:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-13 16:08:01 +0200
commit7cafb62538661863e5c5a0d27b5250bc8f0cdb50 (patch)
tree4b0286307e54143da33759b814daa471a02792e3 /src/corelib
parent8c0b28a5a80e278eb20e6875d212113db94142ae (diff)
Remove OOM exception handling from QDebug
According to the documentation, Qt doesn't even attempt to handle OOM issues anymore. It's questionable in the first place why this should be available only for the stream operator logging ... Change-Id: If94c971793bc6c6773daf3997fe82b410a29538d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qdebug.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index bdaaa05768..a1294d0b40 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -83,11 +83,9 @@ public:
if (stream->space && stream->buffer.endsWith(QLatin1Char(' ')))
stream->buffer.chop(1);
if (stream->message_output) {
- QT_TRY {
- qt_message_output(stream->type,
- stream->context,
- stream->buffer);
- } QT_CATCH(std::bad_alloc&) { /* We're out of memory - give up. */ }
+ qt_message_output(stream->type,
+ stream->context,
+ stream->buffer);
}
delete stream;
}