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

QmlDesigner: Fix for Connections visibility

Browse Source 
- Fixes an issue with connection model not finding Connections in 5.15

Task: QDS-2412

Change-Id: I07bbb900907aaaebccdd90dbc1f037ee0b2fcc61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2020-06-25 14:19:50 +02:00
committed by Thomas Hartmann
parent c0770313f3
commit 4ed146035e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
View File

@@ -56,7 +56,8 @@ bool isConnection(const QmlDesigner::ModelNode &modelNode)
{
return (modelNode.type() == "Connections"
|| modelNode.type() == "QtQuick.Connections"
|| modelNode.type() == "Qt.Connections");
|| modelNode.type() == "Qt.Connections"
|| modelNode.type() == "QtQml.Connections");
}

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

@@ -311,7 +311,7 @@ bool isPropertyChangesType(const QmlDesigner::TypeName &type)
bool isConnectionsType(const QmlDesigner::TypeName &type)
{
return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections";
return type == "Connections" || type == "QtQuick.Connections" || type == "Qt.Connections" || type == "QtQml.Connections";
}
bool propertyIsComponentType(const QmlDesigner::NodeAbstractProperty &property, const QmlDesigner::TypeName &type, QmlDesigner::Model *model)