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

QmlDesigner: Ensure uniqueness of node meta info

Browse Source 
We test for equality by the pointer. To ensure it is uniqueness we now
search for the qualified name. If we get a hit, we use that instance. We
have to add the qualified key too into the cache to make it work.

Change-Id: I7f09203aad5591c41798902a75fc971ece7e1c05
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Marco Bubke
2023-10-04 11:27:55 +02:00
parent a4a8fd5b81
commit a88caa00c7
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -719,7 +719,7 @@ PropertyName NodeMetaInfoPrivate::defaultPropertyName() const
return PropertyName("data"); return PropertyName("data");
} }
inline static TypeName stringIdentifier(const TypeName &type, int maj, int min) static TypeName stringIdentifier(const TypeName &type, int maj, int min)
{ {
return type + QByteArray::number(maj) + '_' + QByteArray::number(min); return type + QByteArray::number(maj) + '_' + QByteArray::number(min);
} }
@@ -729,13 +729,30 @@ std::shared_ptr<NodeMetaInfoPrivate> NodeMetaInfoPrivate::create(Model *model,
int major, int major,
int minor) int minor)
{ {
auto stringfiedType = stringIdentifier(type, major, minor);
auto &cache = model->d->nodeMetaInfoCache(); auto &cache = model->d->nodeMetaInfoCache();
if (auto found = cache.find(stringIdentifier(type, major, minor)); found != cache.end()) if (auto found = cache.find(stringfiedType); found != cache.end())
return *found; return *found;
auto newData = std::make_shared<NodeMetaInfoPrivate>(model, type, major, minor); auto newData = std::make_shared<NodeMetaInfoPrivate>(model, type, major, minor);
if (newData->isValid())
cache.insert(stringIdentifier(type, major, minor), newData); if (!newData->isValid())
return newData;
auto stringfiedQualifiedType = stringIdentifier(newData->qualfiedTypeName(),
newData->majorVersion(),
newData->minorVersion());
if (auto found = cache.find(stringfiedQualifiedType); found != cache.end()) {
cache.insert(stringfiedType, *found);
return *found;
}
if (stringfiedQualifiedType != stringfiedType)
cache.insert(stringfiedQualifiedType, newData);
cache.insert(stringfiedType, newData);
return newData; return newData;
} }