Qml: fix Boot2Qt deployment from Windows host

- fix QmlBuildSystem::target*() to resolve maybe device files
 - Cache lookup of qml path on device

Task-number: QDS-9994
Change-Id: I5675368368f2d1cc513feb98fdcdd75fda1a764a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Tim Jenssen
2023-06-01 17:56:58 +02:00
parent 04b86eb3db
commit 2b4fe0aef8
5 changed files with 32 additions and 41 deletions

View File

@@ -91,11 +91,9 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
// arguments from .qmlproject file
const QmlBuildSystem *bs = qobject_cast<QmlBuildSystem *>(target->buildSystem());
const QStringList importPaths = QmlBuildSystem::makeAbsolute(bs->targetDirectory(),
bs->customImportPaths());
for (const QString &importPath : importPaths) {
for (const QString &importPath : bs->customImportPaths()) {
cmd.addArg("-I");
cmd.addArg(importPath);
cmd.addArg(bs->targetDirectory().pathAppended(importPath).path());
}
for (const QString &fileSelector : bs->customFileSelectors()) {
@@ -114,8 +112,9 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
}
const FilePath main = bs->targetFile(mainScript());
if (!main.isEmpty())
cmd.addArg(main.nativePath());
cmd.addArg(main.path());
return cmd;
});