QQmlInfo: Add qmlDebug & qmlWarning functions alongside qmlInfo

This way, we can correctly write to multiple levels of QDebug with QML context
information. A followup change will port all existing callers, and
subsequently change qmlInfo's message level to QtInfoMsg.

[ChangeLog][QtQml] Introduced qmlDebug & qmlWarning functions to qqmlinfo.h, in
addition to the pre-existing qmlInfo function. As a side effect, QQmlError has
also gained messageType() and setMessageType().

Change-Id: I04ced5952c5c3c58293a89a6767c7b545c03cc0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 23 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index c2915c840b..3a95d353f5 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -1914,9 +1914,29 @@ void QQmlEnginePrivate::sendExit(int retCode)
 
 static void dumpwarning(const QQmlError &error)
 {
-    QMessageLogger(error.url().toString().toLatin1().constData(),
-                   error.line(), 0).warning().nospace()
-            << qPrintable(error.toString());
+    switch (error.messageType()) {
+    case QtDebugMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).debug().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtInfoMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).info().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtWarningMsg:
+    case QtFatalMsg: // fatal does not support streaming, and furthermore, is actually fatal. Probably not desirable for QML.
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).warning().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtCriticalMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).critical().nospace()
+                << qPrintable(error.toString());
+        break;
+    }
 }
 
 static void dumpwarning(const QList<QQmlError> &errors)