From d65eaadd6e011a58d6880bf0a4d3f264e33a742d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 17 May 2010 10:57:06 +0200
Subject: [PATCH] QuickDesigner: Support nesting of all nodes in navigator
Don't check for isContainer, which is rather a hint for the visual
editor whether to nest automatically. In the navigator case, the user
explicitly requested a nesting, and we shouldn't prevent him from doing
so.
Task-number: BAUHAUS-650
Reviewed-by: Christiaan Janssen
---
.../components/navigator/navigatortreemodel.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 25908d605c1..94ab253a99a 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -186,23 +186,25 @@ NavigatorTreeModel::ItemRow NavigatorTreeModel::createItemRow(const ModelNode &n
uint hash = qHash(node);
+ const bool dropEnabled = node.metaInfo().isValid();
+
QStandardItem *idItem = new QStandardItem;
idItem->setDragEnabled(true);
- idItem->setDropEnabled(node.metaInfo().isValid() && node.metaInfo().isContainer());
+ idItem->setDropEnabled(dropEnabled);
idItem->setEditable(true);
idItem->setData(hash, Qt::UserRole);
#ifdef _LOCK_ITEMS_
QStandardItem *lockItem = new QStandardItem;
lockItem->setDragEnabled(true);
- lockItem->setDropEnabled(node.metaInfo().isContainer());
+ lockItem->setDropEnabled(dropEnabled);
lockItem->setEditable(false);
lockItem->setCheckable(true);
lockItem->setData(hash, Qt::UserRole);
#endif
QStandardItem *visibilityItem = new QStandardItem;
- visibilityItem->setDropEnabled(node.metaInfo().isValid() && node.metaInfo().isContainer());
+ visibilityItem->setDropEnabled(dropEnabled);
visibilityItem->setCheckable(true);
visibilityItem->setEditable(false);
visibilityItem->setData(hash, Qt::UserRole);
--
GitLab