Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
This commit is contained in:
Eike Ziller
2022-04-20 16:12:41 +02:00
99 changed files with 1785 additions and 875 deletions

View File

@@ -128,6 +128,7 @@ public:
runControl->buildKey(),
browserId,
QString::number(portsGatherer->findEndPoint().port()));
r.environment = runControl->buildEnvironment();
SimpleTargetRunner::doStart(r);
});
}