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

This reverts commit bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0.
QtTraceMsg was removed from QtCore for the moment, too.

Change-Id: I1d6aaacf5e363f81272da4fbb0a4ff12337dd677
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index 59be0992..f55f96db 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 5b21d83a..74a6a6d9 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;