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

QmlDesigner: Adjust paths for new project structure

Browse Source 
Before we used "content" but in the new project structure
we will use "ProjectNameContent" to make the uri unique.
First check for "content" to support older project.

Keeping only the implementation in DocumentManager::currentResourcePath()

Change-Id: Ib6b21f52c078fdb9a2ff31c02855754f83741538
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2024-04-15 17:06:17 +02:00
parent 3c13cf9493
commit 21f6cbe4e4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -1138,10 +1138,7 @@ static QString getAssetDefaultDirectory(const QString &assetDir, const QString &
{ {
QString adjustedDefaultDirectory = defaultDirectory; QString adjustedDefaultDirectory = defaultDirectory;
Utils::FilePath contentPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath(); Utils::FilePath contentPath = QmlDesignerPlugin::instance()->documentManager().currentResourcePath();
if (contentPath.pathAppended("content").exists())
contentPath = contentPath.pathAppended("content");
Utils::FilePath assetPath = contentPath.pathAppended(assetDir); Utils::FilePath assetPath = contentPath.pathAppended(assetDir);

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

@@ -544,6 +544,13 @@ Utils::FilePath DocumentManager::currentResourcePath()
if (contentFilePath.exists()) if (contentFilePath.exists())
return contentFilePath; return contentFilePath;
const auto project = ProjectManager::startupProject();
const QString baseName = project->rootProjectDirectory().baseName() + "Content";
contentFilePath = resourcePath.pathAppended(baseName);
if (contentFilePath.exists())
return contentFilePath;
return resourcePath; return resourcePath;
} }