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

QmlDesigner: Fix for mainFiles missing filepath

Browse Source 
It always returns projectDirectory otherwise

Task-number: QDS-9984
Change-Id: Ia8a7d660eef46ec4e0afd53c1452798f95367dcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
This commit is contained in:
Aleksei German
2023-06-22 19:31:58 +02:00
parent 474e7fff47
commit 96cd0b3668
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,12 +317,20 @@ void QmlBuildSystem::setBlockFilesUpdate(bool newBlockFilesUpdate)
Utils::FilePath QmlBuildSystem::mainFilePath() const Utils::FilePath QmlBuildSystem::mainFilePath() const
{ {
return projectDirectory().pathAppended(mainFile()); const QString fileName = mainFile();
if (fileName.isEmpty() || fileName.isNull()) {
return {};
}
return projectDirectory().pathAppended(fileName);
} }
Utils::FilePath QmlBuildSystem::mainUiFilePath() const Utils::FilePath QmlBuildSystem::mainUiFilePath() const
{ {
return projectDirectory().pathAppended(mainUiFile()); const QString fileName = mainUiFile();
if (fileName.isEmpty() || fileName.isNull()) {
return {};
}
return projectDirectory().pathAppended(fileName);
} }
bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath) bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath)