diff options
| author | Aleksei German <aleksei.german@qt.io> | 2020-07-15 15:47:13 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-08-13 10:32:16 +0000 |
| commit | 66122492a6358b07b041096b24e87241a9ae9696 (patch) | |
| tree | 3c6b42e85cb6e41532a5f44adcaedb2dedd56b08 /src/plugins/qmldesigner/designercore | |
| parent | 3e1d204c32fa735e599840afe166517fa0f90839 (diff) | |
QmlDesigner: Extend Connections view support
- Connection view support to components
- Connection view support to singletons
- Minor reparenting improvements
Task: QDS-2411
Change-Id: I337535012dbb3d3a1722d75d89156463eabb8a4c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/include/nodemetainfo.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index 05a08d1467..b5e2e7626c 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -75,6 +75,7 @@ public: bool propertyIsListProperty(const PropertyName &propertyName) const; bool propertyIsEnumType(const PropertyName &propertyName) const; bool propertyIsPrivate(const PropertyName &propertyName) const; + bool propertyIsPointer(const PropertyName &propertyName) const; QString propertyEnumScope(const PropertyName &propertyName) const; QStringList propertyKeysForEnum(const PropertyName &propertyName) const; QVariant propertyCastedValue(const PropertyName &propertyName, const QVariant &value) const; @@ -99,6 +100,7 @@ public: bool isSubclassOf(const TypeName &type, int majorVersion = -1, int minorVersion = -1) const; bool isGraphicalItem() const; + bool isQmlItem() const; bool isLayoutable() const; bool isView() const; bool isTabView() const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 3b64f74e0c..afd2aaa9a5 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -427,7 +427,7 @@ QVector<PropertyInfo> getQmlTypes(const CppComponentValue *objectValue, const Co PropertyMemberProcessor processor(context); objectValue->processMembers(&processor); - foreach (const PropertyInfo &property, processor.properties()) { + for (const PropertyInfo &property : processor.properties()) { const PropertyName name = property.first; const QString nameAsString = QString::fromUtf8(name); if (!objectValue->isWritable(nameAsString) && objectValue->isPointer(nameAsString)) { @@ -1500,6 +1500,11 @@ bool NodeMetaInfo::propertyIsPrivate(const PropertyName &propertyName) const return propertyName.startsWith("__"); } +bool NodeMetaInfo::propertyIsPointer(const PropertyName &propertyName) const +{ + return m_privateData->isPropertyPointer(propertyName); +} + QString NodeMetaInfo::propertyEnumScope(const PropertyName &propertyName) const { return m_privateData->propertyEnumScope(propertyName); @@ -1660,6 +1665,12 @@ bool NodeMetaInfo::isGraphicalItem() const || isSubclassOf("QtQuick.Controls.Popup"); } +bool NodeMetaInfo::isQmlItem() const +{ + return isSubclassOf("QtQuick.QtObject") + || isSubclassOf("QtQml.QtObject"); +} + void NodeMetaInfo::clearCache() { Internal::NodeMetaInfoPrivate::clearCache(); |