From 4ed146035eb8fb0f70408cdd7057cc575b9b1fb4 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 25 Jun 2020 14:19:50 +0200 Subject: [PATCH] QmlDesigner: Fix for Connections visibility - Fixes an issue with connection model not finding Connections in 5.15 Task: QDS-2412 Change-Id: I07bbb900907aaaebccdd90dbc1f037ee0b2fcc61 Reviewed-by: Thomas Hartmann --- .../components/connectioneditor/connectionmodel.cpp | 3 ++- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 36444db228a..bad37ed4430 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -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"); } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 2b76471b5b5..fafa408a468 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -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)