From 96cd0b3668db3524ea7ed97e3dd0280044bf3bd0 Mon Sep 17 00:00:00 2001
From: Aleksei German <aleksei.german@qt.io>
Date: Thu, 22 Jun 2023 19:31:58 +0200
Subject: [PATCH] QmlDesigner: Fix for mainFiles missing filepath

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>
---
 .../qmlprojectmanager/buildsystem/qmlbuildsystem.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index bce1b5babc1..d07df6b0fe3 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -317,12 +317,20 @@ void QmlBuildSystem::setBlockFilesUpdate(bool newBlockFilesUpdate)
 
 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
 {
-    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)