diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-01-04 12:06:46 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-01-04 11:27:07 +0000 |
| commit | 56b9f99d76d489b1cadd2b87064d74534f11befe (patch) | |
| tree | 1dc8bd984e855640fd985872af478d1e3a817da9 | |
| parent | afe7d48b6c77771fb373b7fa16ab27f72627242e (diff) | |
| download | qt-creator-56b9f99d76d489b1cadd2b87064d74534f11befe.tar.gz | |
QmlDesigner: The type name of Component is now QML.Component
See also: 90b8e482c94e133203d1e26f88b4c002d546c671
Task-number: QDS-8725
Change-Id: I20cbf8a10015306fee708191095215b19a85614c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qtquickplugin/quick.metainfo | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 8070319a2d..bb7bbb16c0 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -280,7 +280,8 @@ bool isListElementType(const QmlDesigner::TypeName &type) bool isComponentType(const QmlDesigner::TypeName &type) { return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component" - || type == "QtQml.Component" || type == "<cpp>.QQmlComponent" || type == "QQmlComponent"; + || type == "QtQml.Component" || type == "<cpp>.QQmlComponent" || type == "QQmlComponent" + || type == "QML.Component"; } bool isCustomParserType(const QmlDesigner::TypeName &type) diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo index ec420e2720..87b9edcbc0 100644 --- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo +++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo @@ -535,7 +535,7 @@ MetaInfo { } Type { - name: "QtQml.Component" + name: "QML.Component" icon: ":/qtquickplugin/images/component-icon16.png" Hints { @@ -547,7 +547,7 @@ MetaInfo { name: "Component" category: "e.Qt Quick - Component" libraryIcon: ":/qtquickplugin/images/component-icon.png" - version: "2.0" + version: "1.0" QmlSource { source: ":/qtquickplugin/source/component.qml" } toolTip: qsTr("Allows you to define components inline, within a QML document.") @@ -555,7 +555,7 @@ MetaInfo { } Type { - name: "QtQml.Component" + name: "QML.Component" icon: ":/qtquickplugin/images/component-icon16.png" Hints { @@ -567,7 +567,7 @@ MetaInfo { name: "Component 3D" category: "Qt Quick 3D Component" libraryIcon: ":/qtquickplugin/images/component-icon.png" - version: "2.0" + version: "1.0" requiredImport: "QtQuick3D" QmlSource { source: ":/qtquickplugin/source/component3d.qml" } |