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

WebAssembly: fix the running of targets with name != project.name

Browse Source 
The new QtQuick application wizard for Qt 6.2-based applications now
uses different names for the project and for the main target.

The WebAssembly plugin cannot construct the html file name for launching
like <projectname>.html, anymore. It instead would need to use
<targetname>.html for that.

The author of this patch did not manage to programmatically retrieve the
target name or buildkey. So, as a hack, we simply chose the first html
file that we find in the build directory.

Fixes: QTCREATORBUG-26562
Change-Id: I7e929fe265a15501c7275e2c76b7f5fa4ed1e6b5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2021-11-12 10:05:42 +01:00
parent 531f3ada2c
commit dd1882b817
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/webassembly/webassemblyrunconfiguration.cpp
View File

@@ -55,14 +55,20 @@ static FilePath pythonInterpreter(const Environment &env)
return {}; return {};
} }
static CommandLine emrunCommand(Target *target, const QString &browser, const QString &port) static FilePath htmlFileInDir(const FilePath &dir)
{ {
if (BuildConfiguration *bc = target->activeBuildConfiguration()) { const FilePaths htmlFiles = dir.dirEntries(QStringList("*.html"), QDir::Files);
return htmlFiles.isEmpty() ? FilePath() : htmlFiles.first();
}
static CommandLine emrunCommand(const RunConfiguration *rc, const QString &browser,
const QString &port)
{
if (BuildConfiguration *bc = rc->target()->activeBuildConfiguration()) {
const Environment env = bc->environment(); const Environment env = bc->environment();
const FilePath emrun = env.searchInPath("emrun"); const FilePath emrun = env.searchInPath("emrun");
const FilePath emrunPy = emrun.absolutePath().pathAppended(emrun.baseName() + ".py"); const FilePath emrunPy = emrun.absolutePath().pathAppended(emrun.baseName() + ".py");
const FilePath html = const FilePath html = htmlFileInDir(bc->buildDirectory());
bc->buildDirectory().pathAppended(target->project()->displayName() + ".html");
return CommandLine(pythonInterpreter(env), { return CommandLine(pythonInterpreter(env), {
emrunPy.path(), emrunPy.path(),
@@ -91,8 +97,8 @@ public:
effectiveEmrunCall->setDisplayStyle(StringAspect::TextEditDisplay); effectiveEmrunCall->setDisplayStyle(StringAspect::TextEditDisplay);
effectiveEmrunCall->setReadOnly(true); effectiveEmrunCall->setReadOnly(true);
setUpdater([target, effectiveEmrunCall, webBrowserAspect] { setUpdater([this, effectiveEmrunCall, webBrowserAspect] {
effectiveEmrunCall->setValue(emrunCommand(target, effectiveEmrunCall->setValue(emrunCommand(this,
webBrowserAspect->currentBrowser(), webBrowserAspect->currentBrowser(),
"<port>").toUserOutput()); "<port>").toUserOutput());
}); });
@@ -122,7 +128,7 @@ public:
setStarter([this, runControl, portsGatherer] { setStarter([this, runControl, portsGatherer] {
Runnable r; Runnable r;
r.command = emrunCommand(runControl->target(), r.command = emrunCommand(runControl->runConfiguration(),
runControl->aspect<WebBrowserSelectionAspect>()->currentBrowser(), runControl->aspect<WebBrowserSelectionAspect>()->currentBrowser(),
QString::number(portsGatherer->findEndPoint().port())); QString::number(portsGatherer->findEndPoint().port()));
SimpleTargetRunner::doStart(r, {}); SimpleTargetRunner::doStart(r, {});