forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user