diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-03-11 18:42:34 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-03-16 08:46:56 +0000 |
| commit | ba195be0a0cd6bfa5ddb16db692f6d12c46538f6 (patch) | |
| tree | 26f3eec3c815092cc847e852f55a1738dd3c3c2c | |
| parent | f4253fa1c082c690b6d0a97256457764681b4590 (diff) | |
QmlDesigner.Flow: Rename break property to breakPoint
"break" is a JavaScript keyword.
Change-Id: I05d0e7cb342eaacea0da404af32a71ed4e74d5f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index dc3beaa3bc..512f377b54 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -979,8 +979,8 @@ void FormEditorTransitionItem::paint(QPainter *painter, const QStyleOptionGraphi int breakOffset = 50; - if (qmlItemNode().modelNode().hasAuxiliaryData("break")) - breakOffset = qmlItemNode().modelNode().auxiliaryData("break").toInt(); + if (qmlItemNode().modelNode().hasAuxiliaryData("breakPoint")) + breakOffset = qmlItemNode().modelNode().auxiliaryData("breakPoint").toInt(); paintConnection(painter, fromRect, toRect, width, adjustedWidth ,color, dash, outOffset, inOffset, breakOffset); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index da3c331d5c..34f0ecbce0 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -157,7 +157,7 @@ QVariant properDefaultAuxiliaryProperties(const QmlObjectNode &qmlObjectNode, return 0; else if (propertyName == "outOffset") return 0; - else if (propertyName == "break") + else if (propertyName == "breakPoint") return 50; else if (propertyName == "customId") return QString(); @@ -226,7 +226,7 @@ void PropertyEditorQmlBackend::setupAuxiliaryProperties(const QmlObjectNode &qml propertyNames.append("customId"); if (itemNode.isFlowTransition()) { - propertyNames.append({"color", "width", "inOffset", "outOffset", "dash", "break"}); + propertyNames.append({"color", "width", "inOffset", "outOffset", "dash", "breakPoint"}); } else if (itemNode.isFlowItem()) { propertyNames.append({"color", "width", "inOffset", "outOffset"}); } else if (itemNode.isFlowActionArea()) { |