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

QmlDesigner: Move states functions from QmlModelView to StatesEditorView

Browse Source 
Change-Id: I1ac99fbf805b21823e062749bd3342be1641072a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-29 17:12:39 +02:00
committed by Thomas Hartmann
parent 905aeeadcc
commit 8e54a2a58d
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/movetool.cpp
View File

@@ -96,7 +96,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems);
if (containerItem
&& view()->currentState().isBaseState()) {
&& QmlModelState::isBaseState(view()->actualStateNode())) {
if (containerItem != m_movingItems.first()->parentItem()
&& event->modifiers().testFlag(Qt::ShiftModifier)) {
m_moveManipulator.reparentTo(containerItem);