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

QmlDesigner: Fix compile for Qt5.6

Browse Source 
Change-Id: I25cdf8874c03865400a3a1bc451c6c58e9294ab0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2018-03-12 07:04:56 +01:00
committed by Orgad Shaneh
parent 7d83472906
commit a998202acf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -837,7 +837,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
InstanceContainer::NodeFlags nodeFlags; InstanceContainer::NodeFlags nodeFlags;
if (parentTakesOverRendering(instance.modelNode())) if (parentTakesOverRendering(instance.modelNode()))
nodeFlags.setFlag(InstanceContainer::ParentTakesOverRendering); nodeFlags |= InstanceContainer::ParentTakesOverRendering;
InstanceContainer container(instance.instanceId(), InstanceContainer container(instance.instanceId(),
instance.modelNode().type(), instance.modelNode().type(),
@@ -983,7 +983,7 @@ CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QLis
InstanceContainer::NodeFlags nodeFlags; InstanceContainer::NodeFlags nodeFlags;
if (parentTakesOverRendering(instance.modelNode())) if (parentTakesOverRendering(instance.modelNode()))
nodeFlags.setFlag(InstanceContainer::ParentTakesOverRendering); nodeFlags |= InstanceContainer::ParentTakesOverRendering;
InstanceContainer container(instance.instanceId(), InstanceContainer container(instance.instanceId(),
instance.modelNode().type(), instance.modelNode().type(),