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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: Ic9a1cf3b40b259d9c77f2f542405d189171e0fbf
This commit is contained in:
Eike Ziller
2017-09-05 12:15:42 +02:00
parent 3543bd5d1a 410e31c665
commit ca959d8063
11 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,7 @@ bool ConnectableItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
else
newTag = new ScxmlTag(Transition, tag()->document());
newTag->setAttribute("type", "external");
newTag->setAttribute("event", tag()->document()->nextUniqueId("Transition"));
m_newTransition->init(newTag);
tag()->document()->addTag(tag(), newTag);

3
src/plugins/scxmleditor/plugin_interface/scxmltag.cpp
View File

@@ -168,9 +168,6 @@ void ScxmlTag::initId()
case History:
setAttribute("id", m_document->nextUniqueId("History"));
break;
case Transition:
setAttribute("event", m_document->nextUniqueId("Transition"));
break;
case Final:
setAttribute("id", m_document->nextUniqueId("Final"));
break;