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

QmlDesigner: Fix DocumentManager::currentFilePath

Browse Source 
If no QML file was opened this was not working
since we returned too early. This fixes the
function in case no QML file was opened.

Pick-to: qds/4.7
Change-Id: Ie6b8b4becfee4ed05760e31b766d8d0a9b88a666
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2025-03-06 17:34:17 +01:00
committed by Thomas Hartmann
parent 3ca60700ce
commit 77455efafa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -351,12 +351,16 @@ Utils::FilePath DocumentManager::currentProjectDirPath()
{ {
QTC_ASSERT(QmlDesignerPlugin::instance(), return {}); QTC_ASSERT(QmlDesignerPlugin::instance(), return {});
if (!QmlDesignerPlugin::instance()->currentDesignDocument()) if (!QmlDesignerPlugin::instance()->currentDesignDocument()) {
if (ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject())
return project->projectDirectory();
return {}; return {};
}
Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName(); Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName();
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(qmlFileName); ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(qmlFileName);
if (project) if (project)
return project->projectDirectory(); return project->projectDirectory();