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

QmlDesigner: Fix re-opening project error

Browse Source 
Task-number: QDS-9242
Change-Id: Iecd0271014d2f3e3ea8b3cb13271c2cf4a612ce8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Henning Gruendl
2023-02-22 14:55:53 +01:00
committed by Thomas Hartmann
parent ee60b2767d
commit 3f0f2e7021
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -342,12 +342,22 @@ QString QmlBuildSystem::mainUiFile() const
Utils::FilePath QmlBuildSystem::mainFilePath() const Utils::FilePath QmlBuildSystem::mainFilePath() const
{ {
return projectDirectory().pathAppended(mainFile()); const auto mainFileString = mainFile();
if (mainFileString.isEmpty())
return {};
return projectDirectory().pathAppended(mainFileString);
} }
Utils::FilePath QmlBuildSystem::mainUiFilePath() const Utils::FilePath QmlBuildSystem::mainUiFilePath() const
{ {
return projectDirectory().pathAppended(mainUiFile()); const auto mainUiFileString = mainUiFile();
if (mainUiFileString.isEmpty())
return {};
return projectDirectory().pathAppended(mainUiFileString);
} }
bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath) bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath)