aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fuzzy-test/fuzzytester.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/fuzzy-test/fuzzytester.cpp')
-rw-r--r--tests/fuzzy-test/fuzzytester.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp
index ce0aebac9..55a7c91ae 100644
--- a/tests/fuzzy-test/fuzzytester.cpp
+++ b/tests/fuzzy-test/fuzzytester.cpp
@@ -110,7 +110,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit,
QString message = "An incremental build succeeded "
"with a commit for which a clean build failed.";
if (!m_log) {
- message += QString::fromLocal8Bit("\nThe qbs error message "
+ message += QString::fromLatin1("\nThe qbs error message "
"for the clean build was: '%1'").arg(qbsError);
}
throwIncrementalBuildError(message, buildSequence);
@@ -121,7 +121,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit,
QString message = "An incremental build failed "
"with a commit for which a clean build succeeded.";
if (!m_log) {
- message += QString::fromLocal8Bit("\nThe qbs error message for "
+ message += QString::fromLatin1("\nThe qbs error message for "
"the incremental build was: '%1'").arg(qbsError);
}
throwIncrementalBuildError(message, buildSequence);
@@ -172,7 +172,7 @@ QString FuzzyTester::findWorkingStartCommit(const QString &startCommit)
qDebug("Commit %s is not buildable.", qPrintable(m_currentCommit));
m_unbuildableCommits << m_currentCommit;
}
- throw TestError(QString::fromLocal8Bit("Cannot run test: Failed to find a single commit that "
+ throw TestError(QString::fromLatin1("Cannot run test: Failed to find a single commit that "
"builds successfully with qbs. The last qbs error was: '%1'").arg(qbsError));
}
@@ -183,9 +183,9 @@ void FuzzyTester::runGit(const QStringList &arguments, QString *output)
if (!git.waitForStarted())
throw TestError("Failed to start git. It is expected to be in the PATH.");
if (!git.waitForFinished(300000) || git.exitStatus() != QProcess::NormalExit) // 5 minutes ought to be enough for everyone
- throw TestError(QString::fromLocal8Bit("git failed: %1").arg(git.errorString()));
+ throw TestError(QString::fromLatin1("git failed: %1").arg(git.errorString()));
if (git.exitCode() != 0) {
- throw TestError(QString::fromLocal8Bit("git failed: %1")
+ throw TestError(QString::fromLatin1("git failed: %1")
.arg(QString::fromLocal8Bit(git.readAllStandardError())));
}
if (output)
@@ -220,7 +220,7 @@ bool FuzzyTester::runQbs(const QString &buildDir, const QString &command, QStrin
commandLine << ("profile:" + m_profile);
qbs.start("qbs", commandLine);
if (!qbs.waitForStarted()) {
- throw TestError(QString::fromLocal8Bit("Failed to start qbs. It is expected to be "
+ throw TestError(QString::fromLatin1("Failed to start qbs. It is expected to be "
"in the PATH. QProcess error string: '%1'").arg(qbs.errorString()));
}
if (!qbs.waitForFinished(-1) || qbs.exitCode() != 0) {
@@ -235,7 +235,7 @@ void FuzzyTester::removeDir(const QString &dirPath)
{
QDir dir(dirPath);
if (!dir.removeRecursively()) {
- throw TestError(QString::fromLocal8Bit("Failed to remove temporary dir '%1'.")
+ throw TestError(QString::fromLatin1("Failed to remove temporary dir '%1'.")
.arg(dir.absolutePath()));
}
}
@@ -264,7 +264,7 @@ void FuzzyTester::throwIncrementalBuildError(const QString &message,
const QStringList &commitSequence)
{
const QString commitSequenceString = commitSequence.join(QLatin1Char(','));
- throw TestError(QString::fromLocal8Bit("Found qbs bug with incremental build!\n"
+ throw TestError(QString::fromLatin1("Found qbs bug with incremental build!\n"
"%1\n"
"The sequence of commits was: %2.").arg(message, commitSequenceString));
}