diff options
author | Marco Bubke <marco.bubke@digia.com> | 2013-07-29 17:12:39 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-07-31 15:04:15 +0200 |
commit | 8e54a2a58d871bea2db7314572d0715f8f3392e6 (patch) | |
tree | 85f3d642038be15b228564d2b7e9a3a6b40991f2 /src/plugins/qmldesigner/components/formeditor/movetool.cpp | |
parent | 905aeeadcc01378fed851c09fbfc70dc4d8be0b5 (diff) | |
download | qt-creator-8e54a2a58d871bea2db7314572d0715f8f3392e6.tar.gz |
QmlDesigner: Move states functions from QmlModelView to StatesEditorView
Change-Id: I1ac99fbf805b21823e062749bd3342be1641072a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/components/formeditor/movetool.cpp')
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/movetool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 7167b0d3ff..9e11eb297e 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -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); |