Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index a10e706ed7..4c269822d6 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -158,10 +158,13 @@ private slots:
         QFETCH(QtMsgType, msgType);
         QFETCH(LoggingRuleState, result);
 
-        QLoggingRule rule(QStringRef(&pattern), true);
+        const auto categoryL1 = category.toLatin1();
+        const auto categoryL1S = QLatin1String(categoryL1);
+
+        QLoggingRule rule(pattern, true);
         LoggingRuleState state = Invalid;
         if (rule.flags != 0) {
-            switch (rule.pass(category, msgType)) {
+            switch (rule.pass(categoryL1S, msgType)) {
             case -1: QFAIL("Shoudn't happen, we set pattern to true"); break;
             case 0: state = NoMatch; break;
             case 1: state = Match; break;