Add defaultLogLevel to LoggingCategory

Add possibility to define default logging category log level.
Just like in QLoggingCategory constructor.

[ChangeLog][QML Elements][LoggingCategory] Added defaultLogLevel property.
It is possible to define default log level that LoggingCategory
is enabled for.

Task-number: QTBUG-67094
Change-Id: I12557dfb7c228c40b325d0dccde4c525acae0300
Reviewed-by: Michael Brasser <michael.brasser@live.com>

2 files changed, 24 insertions, 3 deletions

diff --git a/tests/auto/qml/qqmlconsole/data/categorized_logging.qml b/tests/auto/qml/qqmlconsole/data/categorized_logging.qml
index d19b6ecc41..d593f0dfa1 100644
--- a/tests/auto/qml/qqmlconsole/data/categorized_logging.qml
+++ b/tests/auto/qml/qqmlconsole/data/categorized_logging.qml
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick 2.12
 
 Item {
     id:root
@@ -48,6 +48,12 @@ Item {
     }
 
     LoggingCategory {
+        id: testCategoryStartingFromWarning
+        name: "qt.test.warning"
+        defaultLogLevel: LoggingCategory.Warning
+    }
+
+    LoggingCategory {
         id: emptyCategory
     }
 
@@ -57,8 +63,14 @@ Item {
         console.info(testCategory, "console.info");
         console.warn(testCategory, "console.warn");
         console.error(testCategory, "console.error");
+        console.debug(testCategoryStartingFromWarning, "console.debug");
+        console.log(testCategoryStartingFromWarning, "console.log");
+        console.info(testCategoryStartingFromWarning, "console.info");
+        console.warn(testCategoryStartingFromWarning, "console.warn");
+        console.error(testCategoryStartingFromWarning, "console.error");
 
         testCategory.name = "qt.test2";
+        testCategory.defaultLogLevel = LoggingCategory.Debug;
 
         console.error(emptyCategory, "console.error");
     }
diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
index 40a9295e50..77805bbbac 100644
--- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
+++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
@@ -112,8 +112,13 @@ void tst_qqmlconsole::categorized_logging()
     QVERIFY(messageHandler.messages().contains("qt.test: console.info"));
     QVERIFY(messageHandler.messages().contains("qt.test: console.warn"));
     QVERIFY(messageHandler.messages().contains("qt.test: console.error"));
+    QVERIFY(!messageHandler.messages().contains("qt.test.warning: console.debug"));
+    QVERIFY(!messageHandler.messages().contains("qt.test.warning: console.log"));
+    QVERIFY(!messageHandler.messages().contains("qt.test.warning: console.info"));
+    QVERIFY(messageHandler.messages().contains("qt.test.warning: console.warn"));
+    QVERIFY(messageHandler.messages().contains("qt.test.warning: console.error"));
 
-    QString emptyCategory = "default: " + QString::fromLatin1("%1:%2:%3: ").arg(testUrl.toString()).arg(50).arg(5) +
+    QString emptyCategory = "default: " + QString::fromLatin1("%1:%2:%3: ").arg(testUrl.toString()).arg(56).arg(5) +
                             "QML LoggingCategory: Declaring the name of the LoggingCategory is mandatory and cannot be changed later !";
     QVERIFY(messageHandler.messages().contains(emptyCategory));
 
@@ -121,7 +126,11 @@ void tst_qqmlconsole::categorized_logging()
                             "QML LoggingCategory: The name of a LoggingCategory cannot be changed after the Item is created";
     QVERIFY(messageHandler.messages().contains(changedCategory));
 
-    QString useEmptyCategory = "default: " + QString::fromLatin1("%1:%2: ").arg(testUrl.toString()).arg(63) +
+    QString changedDefaultLogLevel = "default: " + QString::fromLatin1("%1:%2:%3: ").arg(testUrl.toString()).arg(45).arg(5) +
+                            "QML LoggingCategory: The defaultLogLevel of a LoggingCategory cannot be changed after the Item is created";
+    QVERIFY(messageHandler.messages().contains(changedDefaultLogLevel));
+
+    QString useEmptyCategory = "default: " + QString::fromLatin1("%1:%2: ").arg(testUrl.toString()).arg(75) +
                             "Error: A QmlLoggingCatgory was provided without a valid name";
     QVERIFY(messageHandler.messages().contains(useEmptyCategory));