aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2023-02-22 14:55:53 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2023-02-22 15:21:50 +0000
commit3f0f2e7021b515d88b7fa3c159910ce775713130 (patch)
tree2400f0852d475923ebc4bebcc1a9be1f5abc09ef
parentee60b2767de1c24af80f49c7aa2c396d67ef2baf (diff)
QmlDesigner: Fix re-opening project error
Task-number: QDS-9242 Change-Id: Iecd0271014d2f3e3ea8b3cb13271c2cf4a612ce8 Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
-rw-r--r--src/plugins/qmlprojectmanager/qmlproject.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 2f7cc3699d..86f22a2eba 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -342,12 +342,22 @@ QString QmlBuildSystem::mainUiFile() 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
{
- return projectDirectory().pathAppended(mainUiFile());
+ const auto mainUiFileString = mainUiFile();
+
+ if (mainUiFileString.isEmpty())
+ return {};
+
+ return projectDirectory().pathAppended(mainUiFileString);
}
bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath)