summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-30 03:00:18 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-30 03:00:18 +0200
commit4391e0d7cd49d7011dd2222dac46c807b8dfee96 (patch)
treefe4b41a8a5d2adee650aaec3fc430d59cd258d9d
parent90e38c501aedc103dd4d8c1de1526efc6818de98 (diff)
parent1d2294735536c53fca8e56ed4b262c4bca6b4d29 (diff)
downloadqtscript-4391e0d7cd49d7011dd2222dac46c807b8dfee96.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id34b2bc7a517d3d847b16c3c064593d4cf34f26e
-rw-r--r--tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 102229f..73a1575 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -266,7 +266,7 @@ void tst_QScriptJSTestSuite::runTestFunction(int testIndex)
actual.toString(), expect.toString(),
relpath, lineNumber);
- QTest::newRow(description.toLatin1()) << rec;
+ QTest::newRow(description.toUtf8()) << rec;
}
}
if (!hasData)