From 36c96a0972a4c923e3c6f8045836c336466fee02 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 1 Dec 2022 22:08:49 +0100 Subject: [PATCH] QmlDesigner: Use Model ConnectionMetaInfo method Change-Id: I1ac34ed36df45e8fe1f8baa60311b1c337c4ac71 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/bindingeditor/signallist.cpp | 2 +- .../components/componentcore/designeractionmanager.cpp | 2 +- .../qmldesigner/components/connectioneditor/connectionmodel.cpp | 2 +- src/plugins/qmldesigner/designercore/model/qmlconnections.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp b/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp index 298ba7f91ea..b30f0763d35 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp @@ -223,7 +223,7 @@ void SignalList::addConnection(const QModelIndex &modelIndex) const ModelNode rootModelNode = view->rootModelNode(); if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) { - NodeMetaInfo nodeMetaInfo = view->model()->metaInfo("QtQuick.Connections"); + NodeMetaInfo nodeMetaInfo = view->model()->qtQuickConnectionsMetaInfo(); if (nodeMetaInfo.isValid()) { view->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){ ModelNode newNode = view->createModelNode("QtQuick.Connections", diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 9a416a85eaa..20027265685 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -570,7 +570,7 @@ QList getSlotsLists(const ModelNode &node) //creates connection without signalHandlerProperty ModelNode createNewConnection(ModelNode targetNode) { - NodeMetaInfo connectionsMetaInfo = targetNode.view()->model()->metaInfo("QtQuick.Connections"); + NodeMetaInfo connectionsMetaInfo = targetNode.view()->model()->qtQuickConnectionsMetaInfo(); ModelNode newConnectionNode = targetNode.view()->createModelNode( "QtQuick.Connections", connectionsMetaInfo.majorVersion(), connectionsMetaInfo.minorVersion()); if (QmlItemNode::isValidQmlItemNode(targetNode)) diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 8a4f7bbdb27..5711d696145 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -297,7 +297,7 @@ void ConnectionModel::addConnection() if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) { - NodeMetaInfo nodeMetaInfo = connectionView()->model()->metaInfo("QtQuick.Connections"); + NodeMetaInfo nodeMetaInfo = connectionView()->model()->qtQuickConnectionsMetaInfo(); if (nodeMetaInfo.isValid()) { connectionView()->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){ diff --git a/src/plugins/qmldesigner/designercore/model/qmlconnections.cpp b/src/plugins/qmldesigner/designercore/model/qmlconnections.cpp index 7ba31a8fcc0..aae9528eb64 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlconnections.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlconnections.cpp @@ -99,7 +99,7 @@ QList QmlConnections::signalProperties() const ModelNode QmlConnections::createQmlConnections(AbstractView *view) { - NodeMetaInfo nodeMetaInfo = view->model()->metaInfo("QtQuick.Connections"); + NodeMetaInfo nodeMetaInfo = view->model()->qtQuickConnectionsMetaInfo(); return view->createModelNode("QtQuick.Connections", nodeMetaInfo.majorVersion(), nodeMetaInfo.minorVersion());