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

QmlProjectManager: Allow opening remote .qmlproject

Browse Source 
This get rid of two instances of FilePath::toString and allows now
to opens the default wizard-generated "Qt Quick UI Prototype"
.qmlproject.

As the QmlBuildSystem is still heavily tied to the local file system
this here is only a baby step towards fully functionial remote
.qmlproject support.

Change-Id: I940f99472d45d9ade4966cf4f15b0692a51f2e7b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-08-09 18:32:32 +02:00
parent 62ad0014f1
commit b6569b9333
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
View File

@@ -186,7 +186,7 @@ QJsonObject qmlProjectTojson(const Utils::FilePath &projectFile)
{
QmlJS::SimpleReader simpleQmlJSReader;
const QmlJS::SimpleReaderNode::Ptr rootNode = simpleQmlJSReader.readFile(projectFile.toString());
const QmlJS::SimpleReaderNode::Ptr rootNode = simpleQmlJSReader.readFile(projectFile.toFSPathString());
if (!simpleQmlJSReader.errors().isEmpty() || !rootNode->isValid()) {
qCritical() << "Unable to parse:" << projectFile;

2
src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp
View File

@@ -78,7 +78,7 @@ void QmlProjectItem::setupFileFilters()
fileFilterItem->setRecursive(fileGroup["recursive"].toBool(true));
fileFilterItem->setPathsProperty(fileGroup["directories"].toVariant().toStringList());
fileFilterItem->setPathsProperty(filesArr);
fileFilterItem->setDefaultDirectory(m_projectFile.parentDir().toString());
fileFilterItem->setDefaultDirectory(m_projectFile.parentDir().toFSPathString());
#ifndef TESTS_ENABLED_QMLPROJECTITEM
connect(fileFilterItem.get(),
&FileFilterItem::filesChanged,

6
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
View File

@@ -228,9 +228,9 @@ void QmlBuildSystem::parseProjectFiles()
}
Utils::FilePath mainFilePath{Utils::FilePath::fromString(m_projectItem->mainFile())};
if (!mainFilePath.isEmpty()) {
mainFilePath = canonicalProjectDir().resolvePath(m_projectItem->mainFile());
const QString mainFileName = m_projectItem->mainFile();
if (!mainFileName.isEmpty()) {
Utils::FilePath mainFilePath = canonicalProjectDir().resolvePath(mainFileName);
Utils::FileReader reader;
QString errorMessage;
if (!reader.fetch(mainFilePath, &errorMessage)) {