From 5b64c6ea821dda1a844d14ebd097ced01e996dc6 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 9 Nov 2017 10:06:53 +0100 Subject: [PATCH] AutoTest: Remove confusing information If there is no information regarding the tests to provide to the user 'unknown' is not helpful either. Just give no hint if we do not have any. While at it ensure to provide only non-empty information. Change-Id: Ia1667c2cfd35b0456bfd47c2d4a14ed4d0000a4d Reviewed-by: David Schulz --- src/plugins/autotest/testrunner.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index a49831d5a4b..8997a9815a1 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -324,11 +324,12 @@ void TestRunner::prepareToRunTests(TestRunMode mode) static QString firstTestCaseTarget(const TestConfiguration *config) { - const QSet &internalTargets = config->internalTargets(); - int size = internalTargets.size(); - if (size) - return (*internalTargets.begin()).split('|').first(); - return TestRunner::tr(""); + for (const QString &internalTarget : config->internalTargets()) { + const QString buildTarget = internalTarget.split('|').first(); + if (!buildTarget.isEmpty()) + return buildTarget; + } + return QString(); } static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &dialogDetail) @@ -571,8 +572,10 @@ RunConfigurationSelectionDialog::RunConfigurationSelectionDialog(const QString & setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Select Run Configuration")); - m_details = new QLabel(tr("Could not determine which run configuration to choose for running" - " tests (%1)").arg(testsInfo), this); + QString details = tr("Could not determine which run configuration to choose for running tests"); + if (!testsInfo.isEmpty()) + details.append(QString(" (%1)").arg(testsInfo)); + m_details = new QLabel(details, this); m_rcCombo = new QComboBox(this); m_executable = new QLabel(this); m_arguments = new QLabel(this);