Commit c5704288 authored by Kai Koehne's avatar Kai Koehne Committed by The Qt Project
Browse files

Revert "Handle new QtTraceMsg type, fix warnings about unhandled enumeration value."

This reverts commit bf49d9f0

.
QtTraceMsg was removed from QtCore for the moment, too.

Change-Id: I1d6aaacf5e363f81272da4fbb0a4ff12337dd677
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 5f2a2e71
Branches
Tags
No related merge requests found
Showing with 3 additions and 3 deletions
...@@ -136,12 +136,11 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, ...@@ -136,12 +136,11 @@ void ColoringMessageHandler::handleMessage(QtMsgType type,
break; break;
} }
case QtCriticalMsg: case QtCriticalMsg:
case QtTraceMsg:
/* Fallthrough. */ /* Fallthrough. */
case QtDebugMsg: case QtDebugMsg:
{ {
Q_ASSERT_X(false, Q_FUNC_INFO, 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; return;
} }
} }
......
...@@ -88,7 +88,8 @@ void qMessageHandler(QtMsgType type, const QMessageLogContext &, const QString & ...@@ -88,7 +88,8 @@ void qMessageHandler(QtMsgType type, const QMessageLogContext &, const QString &
return; return;
} }
case QtDebugMsg: /* This enum is handled above in the if-clause. */ case QtDebugMsg: /* This enum is handled above in the if-clause. */
case QtTraceMsg: /* Fallthrough. */
default:
{ {
Q_ASSERT(false); Q_ASSERT(false);
return; return;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment