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

QmlDesigner: The type name of Component is now QML.Component

Browse Source 
See also: 90b8e482c9

Task-number: QDS-8725
Change-Id: I20cbf8a10015306fee708191095215b19a85614c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-01-04 12:06:46 +01:00
parent afe7d48b6c
commit 56b9f99d76
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -280,7 +280,8 @@ bool isListElementType(const QmlDesigner::TypeName &type)
bool isComponentType(const QmlDesigner::TypeName &type) bool isComponentType(const QmlDesigner::TypeName &type)
{ {
return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component" 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) bool isCustomParserType(const QmlDesigner::TypeName &type)

8
src/plugins/qmldesigner/qtquickplugin/quick.metainfo
View File

@@ -535,7 +535,7 @@ MetaInfo {
} }
Type { Type {
name: "QtQml.Component" name: "QML.Component"
icon: ":/qtquickplugin/images/component-icon16.png" icon: ":/qtquickplugin/images/component-icon16.png"
Hints { Hints {
@@ -547,7 +547,7 @@ MetaInfo {
name: "Component" name: "Component"
category: "e.Qt Quick - Component" category: "e.Qt Quick - Component"
libraryIcon: ":/qtquickplugin/images/component-icon.png" libraryIcon: ":/qtquickplugin/images/component-icon.png"
version: "2.0" version: "1.0"
QmlSource { source: ":/qtquickplugin/source/component.qml" } QmlSource { source: ":/qtquickplugin/source/component.qml" }
toolTip: qsTr("Allows you to define components inline, within a QML document.") toolTip: qsTr("Allows you to define components inline, within a QML document.")
@@ -555,7 +555,7 @@ MetaInfo {
} }
Type { Type {
name: "QtQml.Component" name: "QML.Component"
icon: ":/qtquickplugin/images/component-icon16.png" icon: ":/qtquickplugin/images/component-icon16.png"
Hints { Hints {
@@ -567,7 +567,7 @@ MetaInfo {
name: "Component 3D" name: "Component 3D"
category: "Qt Quick 3D Component" category: "Qt Quick 3D Component"
libraryIcon: ":/qtquickplugin/images/component-icon.png" libraryIcon: ":/qtquickplugin/images/component-icon.png"
version: "2.0" version: "1.0"
requiredImport: "QtQuick3D" requiredImport: "QtQuick3D"
QmlSource { source: ":/qtquickplugin/source/component3d.qml" } QmlSource { source: ":/qtquickplugin/source/component3d.qml" }