diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-09-22 10:32:40 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-09-22 10:32:40 +0200 |
| commit | 80e2eddd957bbb35a2197e5a869871017592f7a9 (patch) | |
| tree | 9818b7f7dad27fe3596cbb85b591e59b5114f8e4 /share/qtcreator/qml/qmlpuppet/qml2puppet | |
| parent | 645fce14e006387ba4e2a4befcdd25b1bc1e111c (diff) | |
| parent | fec59c21dfecc2922595e16255d9b18fd374df02 (diff) | |
Merge remote-tracking branch 'origin/8.0'
resolved conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
src/plugins/qmldesigner/designercore/exceptions/exception.cpp
Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp index b79cca8d3c..07212ec459 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp @@ -78,7 +78,13 @@ void Qt5RenderNodeInstanceServer::collectItemChangesAndSendChangeCommands() m_dirtyInstanceSet.insert(instanceForObject(effectParent)); } } - } else if (QQuickDesignerSupport::isDirty(item, QQuickDesignerSupport::AllMask)) { + } else if (DesignerSupport::isDirty( + item, + DesignerSupport::DirtyType( + DesignerSupport::AllMask + | DesignerSupport::ZValue + | DesignerSupport::OpacityValue + | DesignerSupport::Visible))) { ServerNodeInstance ancestorInstance = findNodeInstanceForItem( item->parentItem()); if (ancestorInstance.isValid()) |