From d5540a33537aad21ed41bb6934df6c5fb8cfd1ad Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 17 Feb 2025 19:52:28 +0100 Subject: [PATCH] QmlProjectManager: fix build Change-Id: Ia1749477791194083fde471cf291177b65955fdc Reviewed-by: Tim Jenssen --- .../components/componentcore/modelnodeoperations.cpp | 2 +- .../components/contentlibrary/contentlibraryview.cpp | 2 +- src/plugins/qmldesigner/components/designviewer/dvconnector.cpp | 2 +- .../qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index a4ef1ab1302..d59b69f63ae 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1884,7 +1884,7 @@ FilePath getImported3dDefaultDirectory() { return Utils::FilePath::fromString(getAssetDefaultDirectory( "3d", - QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString())); + QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString())); } void jumpToCode(const ModelNode &modelNode) diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp index da2abb8eb8b..83415587fdc 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp @@ -116,7 +116,7 @@ WidgetInfo ContentLibraryView::widgetInfo() QStringList paths; for (const AssetPath &depAsset : std::as_const(depAssets)) { - QString path = depAsset.absFilPath().toString(); + QString path = depAsset.absFilPath().toUrlishString(); if (Asset(path).isValidTextureSource()) paths.append(path); diff --git a/src/plugins/qmldesigner/components/designviewer/dvconnector.cpp b/src/plugins/qmldesigner/components/designviewer/dvconnector.cpp index 017aa8b654a..f6495e1626b 100644 --- a/src/plugins/qmldesigner/components/designviewer/dvconnector.cpp +++ b/src/plugins/qmldesigner/components/designviewer/dvconnector.cpp @@ -164,7 +164,7 @@ DVConnector::DVConnector(QObject *parent) [this](const std::optional &resourcePath) { emit projectIsUploading(); QString projectName = ProjectExplorer::ProjectManager::startupProject()->displayName(); - uploadProject(projectName, resourcePath->toString()); + uploadProject(projectName, resourcePath->toUrlishString()); }); connect(&m_resourceGenerator, diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp index 10289848b2c..4b3db733ac5 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp @@ -111,7 +111,7 @@ void ResourceGenerator::generateMenuEntry(QObject *parent) if (!success) { Core::AsynchronousMessageBox::critical( 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; }