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

QmlDesigner: Fix component file path

Browse Source 
Change-Id: I9e5f5dc4906c9c498e4a54f92a7d8a105e0399a1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Marco Bubke
2024-04-03 13:34:59 +02:00
parent 316d88bd12
commit 7883f15299
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
View File

@@ -15,6 +15,8 @@
#include "qmlobjectnode.h" #include "qmlobjectnode.h"
#include "variantproperty.h" #include "variantproperty.h"
#include <model/modelutils.h>
#include <utils3d.h> #include <utils3d.h>
#include <utils/expected.h> #include <utils/expected.h>
@@ -292,7 +294,7 @@ bool BakeLightsDataModel::reset()
if (!hasExposedProps && node.metaInfo().isFileComponent() if (!hasExposedProps && node.metaInfo().isFileComponent()
&& node.metaInfo().isQtQuick3DNode()) { && node.metaInfo().isQtQuick3DNode()) {
const QString compFile = node.metaInfo().componentFileName(); const QString compFile = ModelUtils::componentFilePath(node);
const QString projPath = m_view->externalDependencies().currentProjectDirPath(); const QString projPath = m_view->externalDependencies().currentProjectDirPath();
if (compFile.startsWith(projPath)) { if (compFile.startsWith(projPath)) {
// Quick and dirty scan of the component source to check if it potentially has // Quick and dirty scan of the component source to check if it potentially has

4
src/plugins/qmldesigner/designercore/include/nodemetainfo.h
View File

@@ -27,9 +27,11 @@ QT_END_NAMESPACE
# define DEPRECATED_VERSION_NUMBER \ # define DEPRECATED_VERSION_NUMBER \
[[deprecated( \ [[deprecated( \
"In most cases you don't need them anymore because the import is setting them!")]] "In most cases you don't need them anymore because the import is setting them!")]]
# define DEPRECATED_COMPONENT_FILE_NAME [[deprecated("Use sourceId() instead.")]]
#else #else
# define DEPRECATED_TYPENAME # define DEPRECATED_TYPENAME
# define DEPRECATED_VERSION_NUMBER # define DEPRECATED_VERSION_NUMBER
# define DEPRECATED_COMPONENT_FILE_NAME
#endif #endif
namespace QmlDesigner { namespace QmlDesigner {
@@ -116,7 +118,7 @@ public:
Storage::Info::ItemLibraryEntries itemLibrariesEntries() const; Storage::Info::ItemLibraryEntries itemLibrariesEntries() const;
SourceId sourceId() const; SourceId sourceId() const;
QString componentFileName() const; DEPRECATED_COMPONENT_FILE_NAME QString componentFileName() const;
bool isBasedOn(const NodeMetaInfo &metaInfo) const; bool isBasedOn(const NodeMetaInfo &metaInfo) const;
bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const; bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const;

16
src/plugins/qmldesigner/designercore/model/modelutils.cpp
View File

@@ -109,19 +109,19 @@ PropertyMetaInfo metainfo(const ModelNode &node, const PropertyName &propertyNam
return node.metaInfo().property(propertyName); return node.metaInfo().property(propertyName);
} }
QString componentFilePath(const PathCacheType &pathCache, const NodeMetaInfo &metaInfo) QString componentFilePath([[maybe_unused]] const PathCacheType &pathCache, const NodeMetaInfo &metaInfo)
{ {
if constexpr (useProjectStorage()) { #ifdef QDS_USE_PROJECTSTORAGE
auto typeSourceId = metaInfo.sourceId(); auto typeSourceId = metaInfo.sourceId();
if (typeSourceId && metaInfo.isFileComponent()) { if (typeSourceId && metaInfo.isFileComponent()) {
return pathCache.sourcePath(typeSourceId).toQString(); return pathCache.sourcePath(typeSourceId).toQString();
}
} else {
return metaInfo.componentFileName();
} }
return {}; return {};
#else
return metaInfo.componentFileName();
#endif
} }
QString componentFilePath(const ModelNode &node) QString componentFilePath(const ModelNode &node)

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

@@ -130,7 +130,7 @@ static void openComponentSourcePropertyOfLoader(const ModelNode &modelNode)
} }
Core::EditorManager::openEditor(FilePath::fromString( Core::EditorManager::openEditor(FilePath::fromString(
componentModelNode.metaInfo().componentFileName()), ModelUtils::componentFilePath(componentModelNode)),
Utils::Id(), Utils::Id(),
Core::EditorManager::DoNotMakeVisible); Core::EditorManager::DoNotMakeVisible);
} }