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

Change-Id: I88e94fe3398a59f10c5a8b142204db5f3ccb2657

1 files changed, 7 insertions, 7 deletions

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index d5ab267cec..f3a6fea193 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -480,7 +480,7 @@ static QString qtestFixUrl(const QUrl &location)
 void QuickTestResult::fail
     (const QString &message, const QUrl &location, int line)
 {
-    QTestResult::addFailure(message.toLatin1().constData(),
+    QTestResult::addFailure(message.toUtf8().constData(),
                             qtestFixUrl(location).toLatin1().constData(), line);
 }
 
@@ -493,7 +493,7 @@ bool QuickTestResult::verify
              qtestFixUrl(location).toLatin1().constData(), line);
     } else {
         return QTestResult::verify
-            (success, message.toLatin1().constData(), "",
+            (success, message.toUtf8().constData(), "",
              qtestFixUrl(location).toLatin1().constData(), line);
     }
 }
@@ -601,7 +601,7 @@ bool QuickTestResult::compare
      const QUrl &location, int line)
 {
     return QTestResult::compare
-        (success, message.toLocal8Bit().constData(),
+        (success, message.toUtf8().constData(),
          QTest::toString(val1.toString().toLatin1().constData()),
          QTest::toString(val2.toString().toLatin1().constData()),
          "", "",
@@ -611,7 +611,7 @@ bool QuickTestResult::compare
 void QuickTestResult::skip
     (const QString &message, const QUrl &location, int line)
 {
-    QTestResult::addSkip(message.toLatin1().constData(),
+    QTestResult::addSkip(message.toUtf8().constData(),
                          qtestFixUrl(location).toLatin1().constData(), line);
     QTestResult::setSkipCurrentTest(true);
 }
@@ -630,13 +630,13 @@ bool QuickTestResult::expectFailContinue
 {
     return QTestResult::expectFail
         (tag.toLatin1().constData(),
-         QTest::toString(comment.toLatin1().constData()),
+         QTest::toString(comment.toUtf8().constData()),
          QTest::Continue, qtestFixUrl(location).toLatin1().constData(), line);
 }
 
 void QuickTestResult::warn(const QString &message, const QUrl &location, int line)
 {
-    QTestLog::warn(message.toLatin1().constData(), qtestFixUrl(location).toLatin1().constData(), line);
+    QTestLog::warn(message.toUtf8().constData(), qtestFixUrl(location).toLatin1().constData(), line);
 }
 
 void QuickTestResult::ignoreWarning(const QJSValue &message)
@@ -646,7 +646,7 @@ void QuickTestResult::ignoreWarning(const QJSValue &message)
         QTestLog::ignoreMessage(QtWarningMsg, message.toVariant().toRegularExpression());
 #endif
     } else {
-        QTestLog::ignoreMessage(QtWarningMsg, message.toString().toLatin1());
+        QTestLog::ignoreMessage(QtWarningMsg, message.toString().toUtf8());
     }
 }