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

QmlDesigner: Fix merge conflicts

Browse Source 
Task-number: QDS-7723
Change-Id: Id788bb89dc9734c77e01302d9ce50fcb712c67bb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Thomas Hartmann
2022-09-21 12:38:41 +02:00
parent 656731d549
commit e84db05786
4 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
View File

@@ -88,9 +88,11 @@ QVariant PropertyModel::data(const QModelIndex &index, int role) const
if (!propertyChanges.target().isValid()) if (!propertyChanges.target().isValid())
return {}; return {};
return {}; return propertyChanges.target()
// return propertyChanges.target().metaInfo().propertyType( .metaInfo()
// m_properties.at(index.row()).name()); .property(m_properties.at(index.row()).name())
.propertyType()
.typeName();
} }
} }
return {}; return {};

42
src/plugins/qmldesigner/components/stateseditornew/stateseditormodel.cpp
View File

@@ -285,37 +285,41 @@ bool StatesEditorModel::hasAnnotation(int internalNodeId) const
QStringList StatesEditorModel::stateGroups() const QStringList StatesEditorModel::stateGroups() const
{ {
if (!m_statesEditorView->isAttached())
return {}; return {};
// auto stateGroups = Utils::transform(m_statesEditorView->allModelNodesOfType(
// "QtQuick.StateGroup"), const auto groupMetaInfo = m_statesEditorView->model()->qtQuickStateGroupMetaInfo();
// [](const ModelNode &node) { return node.displayName(); });
// stateGroups.prepend(tr("Root")); auto stateGroups = Utils::transform(m_statesEditorView->allModelNodesOfType(groupMetaInfo),
// return stateGroups; [](const ModelNode &node) { return node.displayName(); });
stateGroups.prepend(tr("Root"));
return stateGroups;
} }
QString StatesEditorModel::activeStateGroup() const QString StatesEditorModel::activeStateGroup() const
{ {
if (auto stateGroup = m_statesEditorView->activeStatesGroupNode())
return stateGroup.displayName();
return {}; return {};
// auto stateGroup = m_statesEditorView->activeStatesGroupNode();
// if (!stateGroup.isValid())
// return QString();
// return stateGroup.displayName();
} }
void StatesEditorModel::setActiveStateGroup(const QString &name) void StatesEditorModel::setActiveStateGroup(const QString &name)
{ {
// auto modelNode = Utils::findOrDefault(m_statesEditorView->allModelNodesOfType( if (!m_statesEditorView->isAttached())
// "QtQuick.StateGroup"), return;
// [&name](const ModelNode &node) {
// return node.displayName() == name;
// });
// QTC_ASSERT(!modelNode.isValid(), return ); const auto groupMetaInfo = m_statesEditorView->model()->qtQuickStateGroupMetaInfo();
// if (modelNode.isValid()) auto modelNode = Utils::findOrDefault(m_statesEditorView->allModelNodesOfType(groupMetaInfo),
// m_statesEditorView->setActiveStatesGroupNode(modelNode); [&name](const ModelNode &node) {
return node.displayName() == name;
});
QTC_ASSERT(!modelNode.isValid(), return );
if (modelNode.isValid())
m_statesEditorView->setActiveStatesGroupNode(modelNode);
} }
int StatesEditorModel::activeStateGroupIndex() const int StatesEditorModel::activeStateGroupIndex() const

13
src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
View File

@@ -111,17 +111,18 @@ void StatesEditorView::setActiveStatesGroupNode(const ModelNode &modelNode)
int StatesEditorView::activeStatesGroupIndex() const int StatesEditorView::activeStatesGroupIndex() const
{ {
return 1; return 1;
// return Utils::indexOf(allModelNodesOfType("QtQuick.StateGroup"), return Utils::indexOf(allModelNodesOfType(model()->qtQuickStateGroupMetaInfo()),
// [this](const ModelNode &node) { return node == m_activeStatesGroupNode; }) [this](const ModelNode &node) { return node == m_activeStatesGroupNode; })
// + 1; + 1;
} }
void StatesEditorView::setActiveStatesGroupIndex(int index) void StatesEditorView::setActiveStatesGroupIndex(int index)
{ {
if (index > 0) { if (index > 0) {
// const ModelNode statesGroup = allModelNodesOfType("QtQuick.StateGroup").at(index - 1); const ModelNode statesGroup = allModelNodesOfType(model()->qtQuickStateGroupMetaInfo())
// if (statesGroup.isValid()) .at(index - 1);
// setActiveStatesGroupNode(statesGroup); if (statesGroup.isValid())
setActiveStatesGroupNode(statesGroup);
} else { } else {
setActiveStatesGroupNode(rootModelNode()); setActiveStatesGroupNode(rootModelNode());
} }

12
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -596,14 +596,14 @@ QList<ModelNode> QmlObjectNode::allTimelines() const
QList<ModelNode> QmlObjectNode::getAllConnections() const QList<ModelNode> QmlObjectNode::getAllConnections() const
{ {
// if (!isValid()) if (!isValid())
return {}; return {};
// auto list = view()->allModelNodesOfType("QtQuick.Connections"); auto list = view()->allModelNodesOfType(model()->qtQuickConnectionsMetaInfo());
// return Utils::filtered(list, [this](const ModelNode &connection) { return Utils::filtered(list, [this](const ModelNode &connection) {
// return connection.hasBindingProperty("target") return connection.hasBindingProperty("target")
// && connection.bindingProperty("target").resolveToModelNode() == modelNode(); && connection.bindingProperty("target").resolveToModelNode() == modelNode();
// }); });
} }
/*! /*!