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

QmlDesigner.MetaInfo: Avoid duplicated properties

Browse Source 
For some reason ApplicationWindow seems to be twice in the type hierarchy.
This means all properties specific to ApplicationWindow were
duplicated. This patch avoids adding a property twice.

Task-number: QTCREATORBUG-12910
Change-Id: I8a06fa15778335be8c6977369ece94385b25487c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Thomas Hartmann
2014-08-27 15:25:53 +02:00
parent 92b9f421c0
commit c2be9c01aa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -786,10 +786,12 @@ void NodeMetaInfoPrivate::setupLocalPropertyInfo(QList<PropertyInfo> localProper
void NodeMetaInfoPrivate::setupPropertyInfo(QList<PropertyInfo> propertyInfos) void NodeMetaInfoPrivate::setupPropertyInfo(QList<PropertyInfo> propertyInfos)
{ {
foreach (const PropertyInfo &propertyInfo, propertyInfos) { foreach (const PropertyInfo &propertyInfo, propertyInfos) {
if (!m_properties.contains(propertyInfo.first)) {
m_properties.append(propertyInfo.first); m_properties.append(propertyInfo.first);
m_propertyTypes.append(propertyInfo.second); m_propertyTypes.append(propertyInfo.second);
} }
} }
}
bool NodeMetaInfoPrivate::isPropertyWritable(const PropertyName &propertyName) const bool NodeMetaInfoPrivate::isPropertyWritable(const PropertyName &propertyName) const
{ {