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

QmlDesigner: Fix capitalization of rotBlocked@Internal aux property

Browse Source 
The "@Internal" part of aux property must have the "I" capitalized
for it to avoid affecting document modified state.

Fixes: QDS-4802
Change-Id: Ibbf0006ba6c24bad3ad017a72196dac1d366fe94
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Miikka Heikkinen
2021-11-23 11:39:01 +02:00
parent e56847f200
commit 5841a159c0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -319,7 +319,7 @@ void Qt5InformationNodeInstanceServer::updateRotationBlocks(const QVector<Proper
if (helper) { if (helper) {
QSet<QQuick3DNode *> blockedNodes; QSet<QQuick3DNode *> blockedNodes;
QSet<QQuick3DNode *> unblockedNodes; QSet<QQuick3DNode *> unblockedNodes;
const PropertyName propName = "rotBlocked@internal"; const PropertyName propName = "rotBlocked@Internal";
for (const auto &container : valueChanges) { for (const auto &container : valueChanges) {
if (container.name() == propName) { if (container.name() == propName) {
ServerNodeInstance instance = instanceForId(container.instanceId()); ServerNodeInstance instance = instanceForId(container.instanceId());

4
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -602,7 +602,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
const QVariant &value) const QVariant &value)
{ {
QTC_ASSERT(m_nodeInstanceServer, return); QTC_ASSERT(m_nodeInstanceServer, return);
const bool forceAuxChange = name == "invisible" || name == "locked" || name == "rotBlocked@internal"; const bool forceAuxChange = name == "invisible" || name == "locked" || name == "rotBlocked@Internal";
if (((node.isRootNode() && (name == "width" || name == "height")) || forceAuxChange) if (((node.isRootNode() && (name == "width" || name == "height")) || forceAuxChange)
|| name.endsWith(PropertyName("@NodeInstance"))) { || name.endsWith(PropertyName("@NodeInstance"))) {
if (hasInstanceForModelNode(node)) { if (hasInstanceForModelNode(node)) {
@@ -1900,7 +1900,7 @@ void NodeInstanceView::updateRotationBlocks()
} }
} }
if (!qml3DNodes.isEmpty()) { if (!qml3DNodes.isEmpty()) {
const PropertyName auxDataProp {"rotBlocked@internal"}; const PropertyName auxDataProp {"rotBlocked@Internal"};
for (const auto &node : qAsConst(qml3DNodes)) { for (const auto &node : qAsConst(qml3DNodes)) {
if (rotationKeyframeTargets.contains(node)) if (rotationKeyframeTargets.contains(node))
node.setAuxiliaryData(auxDataProp, true); node.setAuxiliaryData(auxDataProp, true);

2
src/plugins/qmldesigner/designercore/model/qml3dnode.cpp
View File

@@ -83,7 +83,7 @@ void Qml3DNode::setBindingProperty(const PropertyName &name, const QString &expr
bool Qml3DNode::isBlocked(const PropertyName &propName) const bool Qml3DNode::isBlocked(const PropertyName &propName) const
{ {
if (modelNode().isValid() && propName.startsWith("eulerRotation")) if (modelNode().isValid() && propName.startsWith("eulerRotation"))
return modelNode().auxiliaryData("rotBlocked@internal").toBool(); return modelNode().auxiliaryData("rotBlocked@Internal").toBool();
return false; return false;
} }