diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp index 639c962b06b..e2fd28e7371 100644 --- a/src/plugins/autotest/testoutputreader.cpp +++ b/src/plugins/autotest/testoutputreader.cpp @@ -123,7 +123,7 @@ static QString constructBenchmarkInformation(const QString &metric, double value metricsText = QLatin1String("instruction reads"); else if (metric == QLatin1String("CPUCycles")) // -perf metricsText = QLatin1String("CPU cycles"); - return QObject::tr("%1 %2 per iteration (total: %3, iterations: %4)") + return QtTestOutputReader::tr("%1 %2 per iteration (total: %3, iterations: %4)") .arg(formatResult(value)) .arg(metricsText) .arg(formatResult(value * (double)iterations)) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 93554d76a18..04e72db7925 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -99,7 +99,7 @@ TestRunner::TestRunner(QObject *parent) : connect(&m_futureWatcher, &QFutureWatcher::canceled, this, [this]() { emit testResultReady(TestResultPtr(new FaultyTestResult( Result::MessageFatal, - QObject::tr("Test run canceled by user.")))); + tr("Test run canceled by user.")))); }); } @@ -131,7 +131,7 @@ static void performTestRun(QFutureInterface &futureInterface, testCaseCount += config->testCaseCount(); } else { futureInterface.reportResult(TestResultPtr(new FaultyTestResult(Result::MessageWarn, - QObject::tr("Project is null for \"%1\". Removing from test run.\n" + TestRunner::tr("Project is null for \"%1\". Removing from test run.\n" "Check the test environment.").arg(config->displayName())))); } } @@ -164,7 +164,7 @@ static void performTestRun(QFutureInterface &futureInterface, QString commandFilePath = executableFilePath(testConfiguration->targetFile(), environment); if (commandFilePath.isEmpty()) { futureInterface.reportResult(TestResultPtr(new FaultyTestResult(Result::MessageFatal, - QObject::tr("Could not find command \"%1\". (%2)") + TestRunner::tr("Could not find command \"%1\". (%2)") .arg(testConfiguration->targetFile()) .arg(testConfiguration->displayName())))); continue; @@ -231,7 +231,7 @@ static void performTestRun(QFutureInterface &futureInterface, testProcess.waitForFinished(); } futureInterface.reportResult(TestResultPtr( - new FaultyTestResult(Result::MessageFatal, QObject::tr( + new FaultyTestResult(Result::MessageFatal, TestRunner::tr( "Test case canceled due to timeout. \nMaybe raise the timeout?")))); } } diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index 7e50905b6d5..e37a7e5bba1 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -68,14 +68,14 @@ QVariant TestTreeItem::data(int /*column*/, int role) const switch (role) { case Qt::DisplayRole: if (m_type == Root && childCount() == 0) - return QString(m_name + QObject::tr(" (none)")); + return QString(m_name + QCoreApplication::translate("TestTreeItem", " (none)")); else if (m_name.isEmpty()) - return QObject::tr(Constants::UNNAMED_QUICKTESTS); + return QCoreApplication::translate("TestTreeItem", Constants::UNNAMED_QUICKTESTS); else return m_name; case Qt::ToolTipRole: if (m_type == TestCase && m_name.isEmpty()) { - return QObject::tr("

Give all test cases a name to ensure correct behavior " + return QCoreApplication::translate("TestTreeItem","

Give all test cases a name to ensure correct behavior " "when running test cases and to be able to select them.

"); } return m_filePath; @@ -454,7 +454,8 @@ TestTreeItem *GoogleTestTreeItem::findChildByNameStateAndFile(const QString &nam QString GoogleTestTreeItem::nameSuffix() const { - static QString markups[] = { QObject::tr("parameterized"), QObject::tr("typed") }; + static QString markups[] = { QCoreApplication::translate("GoogleTestTreeItem", "parameterized"), + QCoreApplication::translate("GoogleTestTreeItem", "typed") }; QString suffix; if (m_state & Parameterized) suffix = QLatin1String(" [") + markups[0];