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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: I66389d88d5a60c6c86547b93cca945af42aa807b
This commit is contained in:
Eike Ziller
2019-10-28 11:48:31 +01:00
parent 3c556096ca 3f74b04c30
commit bea3a8fa6f
103 changed files with 1888 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,24 +41,26 @@ static QStringList detectedBrowsers(ProjectExplorer::Target *target)
{
static QStringList result;
if (result.isEmpty()) {
const Utils::Environment environment = target->activeBuildConfiguration()->environment();
const Utils::FilePath emrunPath = environment.searchInPath("emrun");
if (auto bc = target->activeBuildConfiguration()) {
const Utils::Environment environment = bc->environment();
const Utils::FilePath emrunPath = environment.searchInPath("emrun");
QProcess browserLister;
browserLister.setProcessEnvironment(environment.toProcessEnvironment());
browserLister.setProgram(emrunPath.toString());
browserLister.setArguments({"--list_browsers"});
browserLister.start(QIODevice::ReadOnly);
QProcess browserLister;
browserLister.setProcessEnvironment(environment.toProcessEnvironment());
browserLister.setProgram(emrunPath.toString());
browserLister.setArguments({"--list_browsers"});
browserLister.start(QIODevice::ReadOnly);
if (browserLister.waitForFinished()) {
const QByteArray output = browserLister.readAllStandardOutput();
QTextStream ts(output);
QString line;
const QRegularExpression regExp(" - (.*):.*");
while (ts.readLineInto(&line)) {
const QRegularExpressionMatch match = regExp.match(line);
if (match.hasMatch())
result << match.captured(1);
if (browserLister.waitForFinished()) {
const QByteArray output = browserLister.readAllStandardOutput();
QTextStream ts(output);
QString line;
const QRegularExpression regExp(" - (.*):.*");
while (ts.readLineInto(&line)) {
const QRegularExpressionMatch match = regExp.match(line);
if (match.hasMatch())
result << match.captured(1);
}
}
}
}
@@ -68,7 +70,8 @@ static QStringList detectedBrowsers(ProjectExplorer::Target *target)
WebBrowserSelectionAspect::WebBrowserSelectionAspect(ProjectExplorer::Target *target)
: m_availableBrowsers(detectedBrowsers(target))
{
m_currentBrowser = m_availableBrowsers.first();
if (!m_availableBrowsers.isEmpty())
m_currentBrowser = m_availableBrowsers.first();
setDisplayName(tr("Web browser"));
setId("WebBrowserAspect");
setSettingsKey("RunConfiguration.WebBrowser");
@@ -91,7 +94,8 @@ void WebBrowserSelectionAspect::addToLayout(ProjectExplorer::LayoutBuilder &buil
void WebBrowserSelectionAspect::fromMap(const QVariantMap &map)
{
m_currentBrowser = map.value(BROWSER_KEY, m_availableBrowsers.first()).toString();
if (!m_availableBrowsers.isEmpty())
m_currentBrowser = map.value(BROWSER_KEY, m_availableBrowsers.first()).toString();
}
void WebBrowserSelectionAspect::toMap(QVariantMap &map) const