diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp index 59be09928b9bc63b85cd0ebac4bf3e2779c61f2d..f55f96dbe3ca5ed839121f581424edfce395118c 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 5b21d83a57baabda0b6c2f139a1faf85e08199e3..74a6a6d9b5240bf7bb12ac820924a2d9687758e3 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;