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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/include/modelnode.h
	src/plugins/qmldesigner/designercore/model/modelnode.cpp
	src/plugins/qmldesigner/designercore/model/rewriterview.cpp

Change-Id: I93c57879b79f27325321bfc045ca618bd835af93
This commit is contained in:
Eike Ziller
2022-08-26 08:40:23 +02:00
parent c10f23a5c6 70343084ba
commit c6c92ec096
57 changed files with 379 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/scxmleditor/plugin_interface/connectableitem.cpp
View File

@@ -64,15 +64,18 @@ ConnectableItem::~ConnectableItem()
{
setBlockUpdates(true);
for (ConnectableItem *item : qAsConst(m_overlappedItems))
const QVector<ConnectableItem *> overlappedItems = m_overlappedItems;
for (ConnectableItem *item : overlappedItems)
item->removeOverlappingItem(this);
m_overlappedItems.clear();
for (TransitionItem *transition : qAsConst(m_outputTransitions))
const QVector<TransitionItem *> outputTransitions = m_outputTransitions;
for (TransitionItem *transition : outputTransitions)
transition->disconnectItem(this);
m_outputTransitions.clear();
for (TransitionItem *transition : qAsConst(m_inputTransitions))
const QVector<TransitionItem *> inputTransitions = m_inputTransitions;
for (TransitionItem *transition : inputTransitions)
transition->disconnectItem(this);
m_inputTransitions.clear();
@@ -310,7 +313,8 @@ void ConnectableItem::updateTransitions(bool allChildren)
updateInputTransitions();
if (allChildren) {
for (QGraphicsItem *it : childItems()) {
const QList<QGraphicsItem *> items = childItems();
for (QGraphicsItem *it : items) {
auto item = static_cast<ConnectableItem*>(it);
if (item && item->type() >= InitialStateType)
item->updateTransitions(allChildren);

2
src/plugins/scxmleditor/plugin_interface/scattributeitemdelegate.cpp
View File

@@ -80,7 +80,7 @@ void SCAttributeItemDelegate::setEditorData(QWidget *editor, const QModelIndex &
combo->clear();
const QStringList values = index.data(DataRole).toString().split(";");
for (QString val : values)
for (const QString &val : values)
combo->addItem(val);
combo->setCurrentText(index.data().toString());