diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarker/commandlineparser.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 94f0d4b52..e1f5026bd 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -135,7 +135,7 @@ QMap<QString, QString> TestBlackbox::findTypeScript(int *status) QString TestBlackbox::findArchiver(const QString &fileName, int *status) { if (fileName == "jar") - return findJdkTools(status)[fileName]; + return findJdkTools(status).value(fileName); QString binary = findExecutable(QStringList(fileName)); if (binary.isEmpty()) { diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp index 97b127d94..7c7e1a9c7 100644 --- a/tests/benchmarker/commandlineparser.cpp +++ b/tests/benchmarker/commandlineparser.cpp @@ -78,9 +78,9 @@ void CommandLineParser::parse() << oldCommitOption << newCommitOption << testProjectOption << qbsRepoOption; for (const QCommandLineOption &o : mandatoryOptions) { if (!parser.isSet(o)) - throwException(o.names().front(), parser.helpText()); + throwException(o.names().constFirst(), parser.helpText()); if (parser.value(o).isEmpty()) - throwException(o.names().front(), QString(), parser.helpText()); + throwException(o.names().constFirst(), QString(), parser.helpText()); } m_oldCommit = parser.value(oldCommitOption); m_newCommit = parser.value(newCommitOption); @@ -99,7 +99,9 @@ void CommandLineParser::parse() } else if (activityString == nullBuildActivity()) { m_activities |= ActivityNullBuild; } else { - throwException(activitiesOption.names().front(), activityString, parser.helpText()); + throwException(activitiesOption.names().constFirst(), + activityString, + parser.helpText()); } } m_regressionThreshold = 5; @@ -108,7 +110,9 @@ void CommandLineParser::parse() const QString rawThresholdValue = parser.value(thresholdOption); m_regressionThreshold = rawThresholdValue.toInt(&ok); if (!ok) - throwException(thresholdOption.names().first(), rawThresholdValue, parser.helpText()); + throwException(thresholdOption.names().constFirst(), + rawThresholdValue, + parser.helpText()); } } |