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

QmlDesigner.contextMenu: crash fix

Browse Source 
Task-number: QTCREATORBUG-6071
Change-Id: Iae2cc199cd8ec3809bc635084b8a8fa79bb36b08
Reviewed-on: http://codereview.qt-project.org/4643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-09-12 10:21:53 +02:00
committed by Eike Ziller
parent c00ee6701b
commit 421a1cf93c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
View File

@@ -71,7 +71,7 @@ static inline bool checkIfNodeIsAView(const ModelNode &node)
static inline bool isItem(const ModelNode &node) static inline bool isItem(const ModelNode &node)
{ {
return node.metaInfo().isValid() && node.metaInfo().isSubclassOf("QtQuick.Item", -1, -1); return node.isValid() && node.metaInfo().isValid() && node.metaInfo().isSubclassOf("QtQuick.Item", -1, -1);
} }
static inline QList<QmlItemNode> siblingsForNode(const QmlItemNode &itemNode) static inline QList<QmlItemNode> siblingsForNode(const QmlItemNode &itemNode)
@@ -251,7 +251,7 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool)
editMenu->addAction(action); editMenu->addAction(action);
action = createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected); action = createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected);
editMenu->addAction(action); editMenu->addAction(action);
if (!isItem(currentSingleNode)) if (singleSelected && !isItem(currentSingleNode))
action->setDisabled(true); action->setDisabled(true);
} else { } else {