diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index fa1579d2a09..871e1aee94f 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -67,13 +67,11 @@ void FormEditorItem::setup() setFlag(QGraphicsItem::ItemClipsChildrenToShape, qmlItemNode().instanceValue("clip").toBool()); - if (NodeHints::fromModelNode(qmlItemNode()).forceClip()) { setFlag(QGraphicsItem::ItemClipsChildrenToShape, true); setFlag(QGraphicsItem::ItemClipsToShape, true); } - if (QGraphicsItem::parentItem() == scene()->formLayerItem()) m_borderWidth = 0.0; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp index 921791061c1..94fa949581b 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp @@ -51,7 +51,7 @@ namespace QmlDesigner { namespace Internal { -static QJSEngine *s_qJSEngine= nullptr; +static QJSEngine *s_qJSEngine = nullptr; static JSObject *s_jsObject = nullptr; static QVariant evaluateExpression(const QString &expression, const ModelNode &modelNode, const ModelNode &otherNode) @@ -77,10 +77,8 @@ QmlDesigner::NodeHints::NodeHints(const ModelNode &node) : m_modelNode(node) QList itemLibraryEntryList = libraryInfo->entriesForType( modelNode().type(), modelNode().majorVersion(), modelNode().minorVersion()); - if (!itemLibraryEntryList.isEmpty()) m_hints = itemLibraryEntryList.first().hints(); - } }