summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2023-05-08 13:06:27 +0200
committerTim Jenssen <tim.jenssen@qt.io>2023-05-08 11:09:55 +0000
commit2ee225b0379129d6dca401a6d4fd1673a92e6fd0 (patch)
treedfe95528a89f4dc90d848fa049f4cca372fc03bc
parent1fd124bc27249cb0d472afef2e02a99e6703995f (diff)
downloadqt-creator-2ee225b0379129d6dca401a6d4fd1673a92e6fd0.tar.gz
QmlDesigner: fix hardcoded types for Qt 6.5.1
Task-number: QDS-9737 Change-Id: I286d706b506904b4d6f22549d1ec294d16859df0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index fe9db55ce6..7db323930f 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -285,7 +285,7 @@ bool isComponentType(const QmlDesigner::TypeName &type)
{
return type == "Component" || type == "Qt.Component" || type == "QtQuick.Component"
|| type == "QtQml.Component" || type == "<cpp>.QQmlComponent" || type == "QQmlComponent"
- || type == "QML.Component";
+ || type == "QML.Component" || type == "QtQml.Base.Component";
}
bool isCustomParserType(const QmlDesigner::TypeName &type)
@@ -305,7 +305,8 @@ bool isPropertyChangesType(const QmlDesigner::TypeName &type)
bool isConnectionsType(const QmlDesigner::TypeName &type)
{
- return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections" || type == "QtQml.Connections";
+ return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections"
+ || type == "QtQml.Connections" || type == "QtQml.Base.Connections";
}
bool propertyIsComponentType(const QmlDesigner::NodeAbstractProperty &property, const QmlDesigner::TypeName &type, QmlDesigner::Model *model)