diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-06 12:34:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 18:13:37 +0100 |
| commit | b7155b6c07b76d802b15dea8eb5aca4085b0d10d (patch) | |
| tree | 4661a1ea2f548be17ea2480162f3b5a18c0532ce /src/corelib/global | |
| parent | 77057674fbe871b6a3eb6fe07084b9288b78571a (diff) | |
make QtCriticalMsg fatal if QT_FATAL_WARNINGS is set
if warnings are fatal, then critical messages should be even more so.
Change-Id: I3681fa1fc606337006f1781dd961ea9cf6ce282d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 13470d9479..f95e1e9447 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -76,7 +76,7 @@ static bool isFatal(QtMsgType msgType) if (msgType == QtFatalMsg) return true; - if (msgType == QtWarningMsg) { + if (msgType == QtWarningMsg || msgType == QtCriticalMsg) { static bool fatalWarnings = !qEnvironmentVariableIsEmpty("QT_FATAL_WARNINGS"); return fatalWarnings; } |