From c2be9c01aadb6031dbaa0f6601e436aa336bed17 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Aug 2014 15:25:53 +0200 Subject: [PATCH] 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 Reviewed-by: Fawzi Mohamed --- .../qmldesigner/designercore/metainfo/nodemetainfo.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 0b4fcccf689..b2500d7adce 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 localProper void NodeMetaInfoPrivate::setupPropertyInfo(QList 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); + } } }