From bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 26 Sep 2013 09:50:57 +0200
Subject: [PATCH] Handle new QtTraceMsg type, fix warnings about unhandled
enumeration value.
Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/xmlpatterns/api/qcoloringmessagehandler.cpp | 3 ++-
tests/auto/xmlpatternssdk/ErrorHandler.cpp | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index f55f96db..59be0992 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler.cpp
+++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
@@ -136,11 +136,12 @@ void ColoringMessageHandler::handleMessage(QtMsgType type,
break;
}
case QtCriticalMsg:
+ case QtTraceMsg:
/* Fallthrough. */
case QtDebugMsg:
{
Q_ASSERT_X(false, Q_FUNC_INFO,
- "message() is not supposed to receive QtCriticalMsg or QtDebugMsg.");
+ "message() is not supposed to receive QtCriticalMsg, QtTraceMsg or QtDebugMsg.");
return;
}
}
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.cpp b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
index 74a6a6d9..5b21d83a 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
@@ -88,8 +88,7 @@ void qMessageHandler(QtMsgType type, const QMessageLogContext &, const QString &
return;
}
case QtDebugMsg: /* This enum is handled above in the if-clause. */
- /* Fallthrough. */
- default:
+ case QtTraceMsg:
{
Q_ASSERT(false);
return;
--
GitLab