diff --git a/doc/src/howto/creator-only/creator-autotest.qdoc b/doc/src/howto/creator-only/creator-autotest.qdoc index 76e352d7d15..1848e0f8a56 100644 --- a/doc/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/src/howto/creator-only/creator-autotest.qdoc @@ -391,7 +391,7 @@ \uicontrol {Limit result output} check box. To disable automatic scrolling, deselect the \uicontrol {Automatically scroll results} check box. - Internal messages and run configuration warnings for guessed configurations + Internal messages and run configuration warnings for deduced configurations are omitted by default. To view them, deselect the \uicontrol {Omit internal messages} and \uicontrol {Omit run configuration warnings} check boxes. */ diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 1cd550c807c..ece34ead496 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -151,11 +151,11 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) if (targetInfo.targetFilePath.isEmpty()) { qCDebug(LOG) << "BuildTargetInfos"; const QList buildTargets = target->applicationTargets().list; - // if there is only one build target just use it (but be honest that we're guessing) + // if there is only one build target just use it (but be honest that we're deducing) if (buildTargets.size() == 1) { targetInfo = buildTargets.first(); - m_guessedConfiguration = true; - m_guessedFrom = targetInfo.buildKey; + m_deducedConfiguration = true; + m_deducedFrom = targetInfo.buildKey; } } @@ -223,8 +223,8 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) if (isLocal(rc)) { // FIXME for now only Desktop support const Runnable runnable = rc->runnable(); m_runnable.environment = runnable.environment; - m_guessedConfiguration = true; - m_guessedFrom = rc->displayName(); + m_deducedConfiguration = true; + m_deducedFrom = rc->displayName(); if (runMode == TestRunMode::Debug) m_runConfig = new TestRunConfiguration(rc->target(), this); } else { @@ -234,7 +234,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) } } - if (m_displayName.isEmpty()) // happens e.g. when guessing the TestConfiguration or error + if (m_displayName.isEmpty()) // happens e.g. when deducing the TestConfiguration or error m_displayName = (*buildSystemTargets.begin()); } diff --git a/src/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h index 52241f5f10d..929731bce3a 100644 --- a/src/plugins/autotest/testconfiguration.h +++ b/src/plugins/autotest/testconfiguration.h @@ -84,8 +84,8 @@ public: ProjectExplorer::RunConfiguration *originalRunConfiguration() const { return m_origRunConfig; } TestRunConfiguration *runConfiguration() const { return m_runConfig; } bool hasExecutable() const; - bool isGuessed() const { return m_guessedConfiguration; } - QString runConfigDisplayName() const { return m_guessedConfiguration ? m_guessedFrom + bool isDeduced() const { return m_deducedConfiguration; } + QString runConfigDisplayName() const { return m_deducedConfiguration ? m_deducedFrom : m_displayName; } ProjectExplorer::Runnable runnable() const { return m_runnable; } @@ -99,9 +99,9 @@ private: QString m_projectFile; QString m_buildDir; QString m_displayName; - QString m_guessedFrom; + QString m_deducedFrom; QPointer m_project; - bool m_guessedConfiguration = false; + bool m_deducedConfiguration = false; TestRunConfiguration *m_runConfig = nullptr; QSet m_buildTargets; ProjectExplorer::RunConfiguration *m_origRunConfig = nullptr; diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 1e5cd5ac748..da720005033 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -138,8 +138,8 @@ static QString processInformation(const QProcess *proc) static QString rcInfo(const TestConfiguration * const config) { QString info = '\n' + TestRunner::tr("Run configuration:") + ' '; - if (config->isGuessed()) - info += TestRunner::tr("guessed from"); + if (config->isDeduced()) + info += TestRunner::tr("deduced from"); return info + " \"" + config->runConfigDisplayName() + '"'; } @@ -406,11 +406,11 @@ int TestRunner::precheckTestConfigurations() config->completeTestInformation(TestRunMode::Run); if (config->project()) { testCaseCount += config->testCaseCount(); - if (!omitWarnings && config->isGuessed()) { + if (!omitWarnings && config->isDeduced()) { QString message = tr( - "Project's run configuration was guessed for \"%1\".\n" + "Project's run configuration was deduced for \"%1\".\n" "This might cause trouble during execution.\n" - "(guessed from \"%2\")"); + "(deduced from \"%2\")"); message = message.arg(config->displayName()).arg(config->runConfigDisplayName()); emit testResultReady( TestResultPtr(new FaultyTestResult(Result::MessageWarn, message))); diff --git a/src/plugins/autotest/testsettingspage.ui b/src/plugins/autotest/testsettingspage.ui index ec79213140c..bef08a5a285 100644 --- a/src/plugins/autotest/testsettingspage.ui +++ b/src/plugins/autotest/testsettingspage.ui @@ -40,7 +40,7 @@ - Hides warnings related to a guessed run configuration. + Hides warnings related to a deduced run configuration. Omit run configuration warnings