diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-26 09:50:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 11:24:04 +0200 |
| commit | bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0 (patch) | |
| tree | 469e3b7580581f2cecdec6e8058a0f1a571295be | |
| parent | e7a51b138772cb453555d27f44e6a2c0e79e799c (diff) | |
| download | qtxmlpatterns-bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0.tar.gz | |
Handle new QtTraceMsg type, fix warnings about unhandled enumeration value.
Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08
Reviewed-by: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | src/xmlpatterns/api/qcoloringmessagehandler.cpp | 3 | ||||
| -rw-r--r-- | 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 f55f96d..59be099 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 74a6a6d..5b21d83 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; |