summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2020-06-29 20:11:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-06-29 20:36:36 +0000
commit4a856f24d930e2a64039e65079c6edc32d2832e2 (patch)
treef3922a6c34480397f0141fad56321e0c39d4191e
parentd4342ab7e827960c417f9aa60340e8a56ff5a1c9 (diff)
Fix the build
Fix the build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9. Change-Id: Icba7cc1fa168a99b4f543bee691925104fb2197f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 623ebde405a7f8c939cd83b8d9fbbf8dfa7ba263) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/linguist/lrelease/tst_lrelease.cpp2
-rw-r--r--tests/auto/linguist/lupdate/tst_lupdate.cpp2
-rw-r--r--tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index d392e51db..26eb238a7 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -83,7 +83,7 @@ void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedF
break;
}
}
- QByteArray diff;
+ QString diff;
for (int j = qMax(0, i - 3); j < i; j++)
diff += expected.at(j) + '\n';
diff += "<<<<<<< got\n";
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index ac6e4db2b..9de25ea0f 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -178,7 +178,7 @@ void tst_lupdate::doCompare(QStringList actual, const QString &expectedFn, bool
require--;
ai++;
}
- QByteArray diff;
+ QString diff;
for (int j = qMax(0, oai - 3); j < oai; j++)
diff += actual.at(j) + '\n';
diff += "<<<<<<< got\n";
diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp
index 59c6fcb78..e1c5e8f3e 100644
--- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp
+++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp
@@ -123,7 +123,7 @@ void tst_qtattributionsscanner::test()
{ // compare error output
QByteArray stdErr = proc.readAllStandardError();
- stdErr.replace(QDir::separator(), "/");
+ stdErr.replace(QDir::separator().toLatin1(), "/");
QByteArray expectedErrorOutput;
readExpectedFile(dir, stderr_file, &expectedErrorOutput);