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

QmlDesigner: Fix build

Browse Source 
Seems the CI don't catched it.

Change-Id: I0a68080162740cabc7c2ee63927abd185e02ce5a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Marco Bubke
2024-07-30 12:48:58 +02:00
parent d386756cbf
commit d079385d81
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,7 +429,8 @@ void ContentLibraryView::auxiliaryDataChanged(const ModelNode &,
active3DSceneChanged(data.toInt()); active3DSceneChanged(data.toInt());
} }
void ContentLibraryView::modelNodePreviewPixmapChanged(const ModelNode &node, const QPixmap &pixmap, void ContentLibraryView::modelNodePreviewPixmapChanged(const ModelNode &,
const QPixmap &pixmap,
const QByteArray &requestId) const QByteArray &requestId)
{ {
if (requestId == ADD_ITEM_REQ_ID) if (requestId == ADD_ITEM_REQ_ID)
@@ -497,6 +498,19 @@ void ContentLibraryView::applyBundleMaterialToDropTarget(const ModelNode &bundle
} }
#endif #endif
namespace {
Utils::FilePath componentPath([[maybe_unused]] const NodeMetaInfo &metaInfo)
{
#ifdef QDS_USE_PROJECTSTORAGE
// TODO
return {};
#else
return Utils::FilePath::fromString(metaInfo.importDirectoryPath());
#endif
}
} // namespace
QPair<QString, QSet<AssetPath>> ContentLibraryView::modelNodeToQmlString(const ModelNode &node, int depth) QPair<QString, QSet<AssetPath>> ContentLibraryView::modelNodeToQmlString(const ModelNode &node, int depth)
{ {
static QStringList depListIds; static QStringList depListIds;
@@ -590,7 +604,7 @@ QPair<QString, QSet<AssetPath>> ContentLibraryView::modelNodeToQmlString(const M
if (depth > 0) { if (depth > 0) {
// add component file to the dependency assets // add component file to the dependency assets
Utils::FilePath compFilePath = Utils::FilePath::fromString(node.metaInfo().componentFileName()); Utils::FilePath compFilePath = componentPath(node.metaInfo());
assets.insert({compFilePath.parentDir().path(), compFilePath.fileName()}); assets.insert({compFilePath.parentDir().path(), compFilePath.fileName()});
} }
@@ -1194,7 +1208,7 @@ QSet<AssetPath> ContentLibraryView::getBundleComponentDependencies(const ModelNo
{ {
const QString compFileName = node.simplifiedTypeName() + ".qml"; const QString compFileName = node.simplifiedTypeName() + ".qml";
Utils::FilePath compPath = Utils::FilePath::fromString(node.metaInfo().importDirectoryPath()); Utils::FilePath compPath = componentPath(node.metaInfo());
QTC_ASSERT(compPath.exists(), return {}); QTC_ASSERT(compPath.exists(), return {});