feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

WebAssembly: Limit the usage of qMakePair

Browse Source 
Change-Id: If4bdf567cf0dd1e01cbe41971f2d47ebc06a1d65
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 12:17:16 +02:00
parent b885281ce7
commit b6c8ce20e6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
View File

@@ -34,15 +34,14 @@ static WebBrowserEntries parseEmrunOutput(const QByteArray &output)
while (ts.readLineInto(&line)) { while (ts.readLineInto(&line)) {
const QRegularExpressionMatch match = regExp.match(line); const QRegularExpressionMatch match = regExp.match(line);
if (match.hasMatch()) if (match.hasMatch())
result << qMakePair(match.captured(1), match.captured(2).trimmed()); result.push_back({match.captured(1), match.captured(2).trimmed()});
} }
return result; return result;
} }
static WebBrowserEntries emrunBrowsers(ProjectExplorer::Target *target) static WebBrowserEntries emrunBrowsers(ProjectExplorer::Target *target)
{ {
WebBrowserEntries result; WebBrowserEntries result{{{}, WebBrowserSelectionAspect::tr("Default Browser")}};
result.append(qMakePair(QString(), WebBrowserSelectionAspect::tr("Default Browser")));
if (auto bc = target->activeBuildConfiguration()) { if (auto bc = target->activeBuildConfiguration()) {
const Utils::Environment environment = bc->environment(); const Utils::Environment environment = bc->environment();
const Utils::FilePath emrunPath = environment.searchInPath("emrun"); const Utils::FilePath emrunPath = environment.searchInPath("emrun");
@@ -134,8 +133,8 @@ Even if your browser was not detected, you can use --browser /path/to/browser/ex
)") )")
<< WebBrowserEntries({ << WebBrowserEntries({
qMakePair(QLatin1String("firefox"), QLatin1String("Mozilla Firefox")), {QLatin1String("firefox"), QLatin1String("Mozilla Firefox")},
qMakePair(QLatin1String("chrome"), QLatin1String("Google Chrome"))}); {QLatin1String("chrome"), QLatin1String("Google Chrome")}});
QTest::newRow("emsdk 2.0.14") QTest::newRow("emsdk 2.0.14")
<< QByteArray( << QByteArray(
@@ -149,8 +148,8 @@ Even if your browser was not detected, you can use --browser /path/to/browser/ex
)") )")
<< WebBrowserEntries({ << WebBrowserEntries({
qMakePair(QLatin1String("firefox"), QLatin1String("Mozilla Firefox 96.0.0.8041")), {QLatin1String("firefox"), QLatin1String("Mozilla Firefox 96.0.0.8041")},
qMakePair(QLatin1String("chrome"), QLatin1String("Google Chrome 97.0.4692.71"))}); {QLatin1String("chrome"), QLatin1String("Google Chrome 97.0.4692.71")}});
} }
#endif // WITH_TESTS #endif // WITH_TESTS