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

white space only changes

Browse Source 
Change-Id: Ib78ea3244594320f54a2feb04f639caa83e1ba84
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-01-24 18:08:33 +01:00
parent 30b9dd4884
commit 7db35aa8ef
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
View File

@@ -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;

4
src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp
View File

@@ -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 <ItemLibraryEntry> itemLibraryEntryList = libraryInfo->entriesForType(
modelNode().type(), modelNode().majorVersion(), modelNode().minorVersion());
if (!itemLibraryEntryList.isEmpty())
m_hints = itemLibraryEntryList.first().hints();
}
}