summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2020-06-17 22:53:53 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2020-06-25 09:54:16 +0200
commitd7ccd8cb4565c8643b158891c9de3187c1586dc9 (patch)
tree5f3fbd8a91cf2c460891453497f8e4b8ac2f82ba /tests/auto/tools
parent2df4991cb1a893522caac838d6c4edf5ad8da464 (diff)
Remove QByteArray's methods taking QString and their uses
[ChangeLog][QtCore][QByteArray] Remove method overloads taking QString as argument, all of which were equivalent to passing the toUtf8() of the string instead. Change-Id: I9251733a9b3711153b2faddbbc907672a7cba190 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/rcc/tst_rcc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index 9388b63d0f..a4dbbfb657 100644
--- a/tests/auto/tools/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
@@ -152,7 +152,7 @@ static QString doCompare(const QStringList &actual, const QStringList &expected,
if (expectedLine != actual.at(i)) {
qDebug() << "LINES" << (i + 1) << "DIFFER";
ba.append(
- "\n<<<<<< actual\n" + actual.at(i) + "\n======\n" + expectedLine
+ "\n<<<<<< actual\n" + actual.at(i).toUtf8() + "\n======\n" + expectedLine.toUtf8()
+ "\n>>>>>> expected\n"
);
}