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

QmlDesigner: Use Model ConnectionMetaInfo method

Browse Source 
Change-Id: I1ac34ed36df45e8fe1f8baa60311b1c337c4ac71
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2022-12-01 22:08:49 +01:00
parent 57448021b8
commit 36c96a0972
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/bindingeditor/signallist.cpp
View File

@@ -223,7 +223,7 @@ void SignalList::addConnection(const QModelIndex &modelIndex)
const ModelNode rootModelNode = view->rootModelNode(); const ModelNode rootModelNode = view->rootModelNode();
if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) { if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) {
NodeMetaInfo nodeMetaInfo = view->model()->metaInfo("QtQuick.Connections"); NodeMetaInfo nodeMetaInfo = view->model()->qtQuickConnectionsMetaInfo();
if (nodeMetaInfo.isValid()) { if (nodeMetaInfo.isValid()) {
view->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){ view->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){
ModelNode newNode = view->createModelNode("QtQuick.Connections", ModelNode newNode = view->createModelNode("QtQuick.Connections",

2
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -570,7 +570,7 @@ QList<SlotList> getSlotsLists(const ModelNode &node)
//creates connection without signalHandlerProperty //creates connection without signalHandlerProperty
ModelNode createNewConnection(ModelNode targetNode) ModelNode createNewConnection(ModelNode targetNode)
{ {
NodeMetaInfo connectionsMetaInfo = targetNode.view()->model()->metaInfo("QtQuick.Connections"); NodeMetaInfo connectionsMetaInfo = targetNode.view()->model()->qtQuickConnectionsMetaInfo();
ModelNode newConnectionNode = targetNode.view()->createModelNode( ModelNode newConnectionNode = targetNode.view()->createModelNode(
"QtQuick.Connections", connectionsMetaInfo.majorVersion(), connectionsMetaInfo.minorVersion()); "QtQuick.Connections", connectionsMetaInfo.majorVersion(), connectionsMetaInfo.minorVersion());
if (QmlItemNode::isValidQmlItemNode(targetNode)) if (QmlItemNode::isValidQmlItemNode(targetNode))

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

@@ -297,7 +297,7 @@ void ConnectionModel::addConnection()
if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) { if (rootModelNode.isValid() && rootModelNode.metaInfo().isValid()) {
NodeMetaInfo nodeMetaInfo = connectionView()->model()->metaInfo("QtQuick.Connections"); NodeMetaInfo nodeMetaInfo = connectionView()->model()->qtQuickConnectionsMetaInfo();
if (nodeMetaInfo.isValid()) { if (nodeMetaInfo.isValid()) {
connectionView()->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){ connectionView()->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){

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

@@ -99,7 +99,7 @@ QList<SignalHandlerProperty> QmlConnections::signalProperties() const
ModelNode QmlConnections::createQmlConnections(AbstractView *view) ModelNode QmlConnections::createQmlConnections(AbstractView *view)
{ {
NodeMetaInfo nodeMetaInfo = view->model()->metaInfo("QtQuick.Connections"); NodeMetaInfo nodeMetaInfo = view->model()->qtQuickConnectionsMetaInfo();
return view->createModelNode("QtQuick.Connections", return view->createModelNode("QtQuick.Connections",
nodeMetaInfo.majorVersion(), nodeMetaInfo.majorVersion(),
nodeMetaInfo.minorVersion()); nodeMetaInfo.minorVersion());