summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-27 15:25:53 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-28 14:22:42 +0200
commitc2be9c01aadb6031dbaa0f6601e436aa336bed17 (patch)
tree88b2bfb02262b995138a370e2d618501841e5fd7 /src/plugins
parent92b9f421c0aa3429992a5658d62a5d98d6bb1fc3 (diff)
downloadqt-creator-c2be9c01aadb6031dbaa0f6601e436aa336bed17.tar.gz
QmlDesigner.MetaInfo: Avoid duplicated properties
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>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 0b4fcccf68..b2500d7adc 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -786,8 +786,10 @@ void NodeMetaInfoPrivate::setupLocalPropertyInfo(QList<PropertyInfo> localProper
void NodeMetaInfoPrivate::setupPropertyInfo(QList<PropertyInfo> propertyInfos)
{
foreach (const PropertyInfo &propertyInfo, propertyInfos) {
- m_properties.append(propertyInfo.first);
- m_propertyTypes.append(propertyInfo.second);
+ if (!m_properties.contains(propertyInfo.first)) {
+ m_properties.append(propertyInfo.first);
+ m_propertyTypes.append(propertyInfo.second);
+ }
}
}