summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xmlpatterns/api/qcoloringmessagehandler.cpp3
-rw-r--r--tests/auto/xmlpatternssdk/ErrorHandler.cpp3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index 59be099..f55f96d 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler.cpp
+++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
@@ -136,12 +136,11 @@ 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, QtTraceMsg or QtDebugMsg.");
+ "message() is not supposed to receive QtCriticalMsg or QtDebugMsg.");
return;
}
}
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.cpp b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
index 5b21d83..74a6a6d 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.cpp
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
@@ -88,7 +88,8 @@ void qMessageHandler(QtMsgType type, const QMessageLogContext &, const QString &
return;
}
case QtDebugMsg: /* This enum is handled above in the if-clause. */
- case QtTraceMsg:
+ /* Fallthrough. */
+ default:
{
Q_ASSERT(false);
return;