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

QmlProjectManager: More FilePath use

Browse Source 
Change-Id: I7af611bdeffb8f06c5f014224c0b6c639a1d8a6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-12-13 10:48:30 +01:00
parent a1711fc5ba
commit 2f7263cd67
1 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -40,9 +40,7 @@ using namespace ProjectExplorer;
using namespace QtSupport; using namespace QtSupport;
using namespace Utils; using namespace Utils;
namespace QmlProjectManager { namespace QmlProjectManager::Internal {
class QmlMultiLanguageAspect;
namespace Internal {
// QmlProjectRunConfiguration // QmlProjectRunConfiguration
@@ -59,7 +57,6 @@ private:
QString mainScript() const; QString mainScript() const;
FilePath qmlRuntimeFilePath() const; FilePath qmlRuntimeFilePath() const;
QString commandLineArguments() const;
void createQtVersionAspect(); void createQtVersionAspect();
StringAspect *m_qmlViewerAspect = nullptr; StringAspect *m_qmlViewerAspect = nullptr;
@@ -80,8 +77,42 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
auto argumentAspect = addAspect<ArgumentsAspect>(macroExpander()); auto argumentAspect = addAspect<ArgumentsAspect>(macroExpander());
argumentAspect->setSettingsKey(Constants::QML_VIEWER_ARGUMENTS_KEY); argumentAspect->setSettingsKey(Constants::QML_VIEWER_ARGUMENTS_KEY);
setCommandLineGetter([this] { setCommandLineGetter([this, target] {
return CommandLine(qmlRuntimeFilePath(), commandLineArguments(), CommandLine::Raw); const FilePath qmlRuntime = qmlRuntimeFilePath();
CommandLine cmd(qmlRuntime);
// arguments in .user file
cmd.addArgs(aspect<ArgumentsAspect>()->arguments(), CommandLine::Raw);
// 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) {
cmd.addArg("-I");
cmd.addArg(importPath);
}
for (const QString &fileSelector : bs->customFileSelectors()) {
cmd.addArg("-S");
cmd.addArg(fileSelector);
}
if (qmlRuntime.osType() == OsTypeWindows && bs->forceFreeType()) {
cmd.addArg("-platform");
cmd.addArg("windows:fontengine=freetype");
}
if (bs->qt6Project() && bs->widgetApp()) {
cmd.addArg("--apptype");
cmd.addArg("widget");
}
const FilePath main = bs->targetFile(FilePath::fromString(mainScript()));
if (!main.isEmpty())
cmd.addArg(main.nativePath());
return cmd;
}); });
m_qmlMainFileAspect = addAspect<QmlMainFileAspect>(target); m_qmlMainFileAspect = addAspect<QmlMainFileAspect>(target);
@@ -188,45 +219,6 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
return qmlRuntime.isEmpty() ? "qmlscene" : qmlRuntime; return qmlRuntime.isEmpty() ? "qmlscene" : qmlRuntime;
} }
QString QmlProjectRunConfiguration::commandLineArguments() const
{
// arguments in .user file
QString args = aspect<ArgumentsAspect>()->arguments();
const IDevice::ConstPtr device = DeviceKitAspect::device(kit());
const OsType osType = device ? device->osType() : HostOsInfo::hostOs();
// 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) {
ProcessArgs::addArg(&args, "-I", osType);
ProcessArgs::addArg(&args, importPath, osType);
}
for (const QString &fileSelector : bs->customFileSelectors()) {
ProcessArgs::addArg(&args, "-S", osType);
ProcessArgs::addArg(&args, fileSelector, osType);
}
if (HostOsInfo::isWindowsHost() && bs->forceFreeType()) {
ProcessArgs::addArg(&args, "-platform", osType);
ProcessArgs::addArg(&args, "windows:fontengine=freetype", osType);
}
if (bs->qt6Project() && bs->widgetApp()) {
ProcessArgs::addArg(&args, "--apptype", osType);
ProcessArgs::addArg(&args, "widget", osType);
}
const QString main = bs->targetFile(FilePath::fromString(mainScript())).toString();
if (!main.isEmpty())
ProcessArgs::addArg(&args, main, osType);
return args;
}
void QmlProjectRunConfiguration::createQtVersionAspect() void QmlProjectRunConfiguration::createQtVersionAspect()
{ {
if (!QmlProject::isQtDesignStudio()) if (!QmlProject::isQtDesignStudio())
@@ -312,5 +304,4 @@ QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory()
addSupportedProjectType(QmlProjectManager::Constants::QML_PROJECT_ID); addSupportedProjectType(QmlProjectManager::Constants::QML_PROJECT_ID);
} }
} // namespace Internal } // QmlProjectManager::Internal
} // namespace QmlProjectManager