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

QmlProjectManager: fix build

Browse Source 
Change-Id: Ia1749477791194083fde471cf291177b65955fdc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2025-02-17 19:52:28 +01:00
parent 9e6a2cc2da
commit d5540a3353
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1884,7 +1884,7 @@ FilePath getImported3dDefaultDirectory()
{ {
return Utils::FilePath::fromString(getAssetDefaultDirectory( return Utils::FilePath::fromString(getAssetDefaultDirectory(
"3d", "3d",
QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString())); QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString()));
} }
void jumpToCode(const ModelNode &modelNode) void jumpToCode(const ModelNode &modelNode)

2
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
View File

@@ -116,7 +116,7 @@ WidgetInfo ContentLibraryView::widgetInfo()
QStringList paths; QStringList paths;
for (const AssetPath &depAsset : std::as_const(depAssets)) { for (const AssetPath &depAsset : std::as_const(depAssets)) {
QString path = depAsset.absFilPath().toString(); QString path = depAsset.absFilPath().toUrlishString();
if (Asset(path).isValidTextureSource()) if (Asset(path).isValidTextureSource())
paths.append(path); paths.append(path);

2
src/plugins/qmldesigner/components/designviewer/dvconnector.cpp
View File

@@ -164,7 +164,7 @@ DVConnector::DVConnector(QObject *parent)
[this](const std::optional<Utils::FilePath> &resourcePath) { [this](const std::optional<Utils::FilePath> &resourcePath) {
emit projectIsUploading(); emit projectIsUploading();
QString projectName = ProjectExplorer::ProjectManager::startupProject()->displayName(); QString projectName = ProjectExplorer::ProjectManager::startupProject()->displayName();
uploadProject(projectName, resourcePath->toString()); uploadProject(projectName, resourcePath->toUrlishString());
}); });
connect(&m_resourceGenerator, connect(&m_resourceGenerator,

2
src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp
View File

@@ -111,7 +111,7 @@ void ResourceGenerator::generateMenuEntry(QObject *parent)
if (!success) { if (!success) {
Core::AsynchronousMessageBox::critical( Core::AsynchronousMessageBox::critical(
Tr::tr("Error"), Tr::tr("Error"),
Tr::tr("Failed to generate QRC resource file\n %1").arg(qrcFilePath.toString())); Tr::tr("Failed to generate QRC resource file\n %1").arg(qrcFilePath.toUserOutput()));
return; return;
} }