From b6ea314a55dd08ac1925eadf7fe3db2d1737ba5d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 24 Feb 2014 16:42:11 +0100 Subject: [PATCH] QmlDesigner: Don't drop anymore in a layoutable The behavior to drop something in a layoutable is quite strange because we don't support visual layouting at all. Task-number: QTCREATORBUG-11543 Change-Id: I4d455d3a6f099edfeacbdb0def2e9e9c4489768c Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 393ab9a454c..8c08d7da65b 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -191,8 +191,11 @@ FormEditorItem* DragTool::calculateContainer(const QPointF &point, FormEditorIte QList list = scene()->items(point); foreach (QGraphicsItem *item, list) { FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); - if (formEditorItem && formEditorItem != currentItem && formEditorItem->isContainer() - && !isAncestorOf(currentItem, formEditorItem)) + if (formEditorItem + && formEditorItem != currentItem + && formEditorItem->isContainer() + && !formEditorItem->qmlItemNode().modelNode().metaInfo().isLayoutable() + && !isAncestorOf(currentItem, formEditorItem)) return formEditorItem; }