From d7ccd8cb4565c8643b158891c9de3187c1586dc9 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 17 Jun 2020 22:53:53 +0200 Subject: 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 Reviewed-by: Lars Knoll --- tests/auto/tools/rcc/tst_rcc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/tools') 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" ); } -- cgit v1.2.3